diff --git a/javaDSL/src/test/resources/de/monticore/java/parser/ASTClassDeclaration.java b/javaDSL/src/test/resources/de/monticore/java/parser/ASTClassDeclaration.java
index bfae8aa3..c8783a1a 100644
--- a/javaDSL/src/test/resources/de/monticore/java/parser/ASTClassDeclaration.java
+++ b/javaDSL/src/test/resources/de/monticore/java/parser/ASTClassDeclaration.java
@@ -81,9 +81,8 @@ protected  ASTClassDeclaration (/* generated by template ast.ConstructorParamete
   
    public  void accept(de.monticore.javadsl.javadsl._visitor.JavaDSLVisitor visitor)
    
-    { 
-     /* generated by template ast.ErrorIfNull*/
-    Log.errorIfNull(visitor);
+    {
+     Preconditions.checkNotNull(visitor);
  
      /* generated by template ast.additionalmethods.Accept*/
 
@@ -95,9 +94,8 @@ public  void accept(de.monticore.javadsl.javadsl._visitor.JavaDSLVisitor visitor
   
    public  boolean deepEquals(Object o)
    
-    { 
-     /* generated by template ast.ErrorIfNull*/
-    Log.errorIfNull(o);
+    {
+     Preconditions.checkNotNull(o);
  
      /* generated by template ast.additionalmethods.DeepEquals*/
 
@@ -144,9 +142,8 @@ public  boolean deepEquals(Object o)
   
    public  boolean deepEquals(Object o,boolean forceSameOrder)
    
-    { 
-     /* generated by template ast.ErrorIfNull*/
-    Log.errorIfNull(o);
+    {
+     Preconditions.checkNotNull(o);
  
      return deepEquals(o);
 
@@ -156,9 +153,8 @@ public  boolean deepEquals(Object o,boolean forceSameOrder)
   
    public  boolean deepEqualsWithComments(Object o)
    
-    { 
-     /* generated by template ast.ErrorIfNull*/
-    Log.errorIfNull(o);
+    {
+     Preconditions.checkNotNull(o);
  
      /* generated by template ast.additionalmethods.DeepEqualsWithComments*/
 
@@ -204,9 +200,8 @@ public  boolean deepEqualsWithComments(Object o)
   
    public  boolean deepEqualsWithComments(Object o,boolean forceSameOrder)
    
-    { 
-     /* generated by template ast.ErrorIfNull*/
-    Log.errorIfNull(o);
+    {
+     Preconditions.checkNotNull(o);
  
      return deepEqualsWithComments(o);
 
@@ -216,9 +211,8 @@ public  boolean deepEqualsWithComments(Object o,boolean forceSameOrder)
   
    public  boolean equalAttributes(Object o)
    
-    { 
-     /* generated by template ast.ErrorIfNull*/
-    Log.errorIfNull(o);
+    {
+     Preconditions.checkNotNull(o);
  
      /* generated by template ast.additionalmethods.EqualAttributes*/
 
@@ -252,9 +246,8 @@ public  boolean equalAttributes(Object o)
   
    public  boolean equalsWithComments(Object o)
    
-    { 
-     /* generated by template ast.ErrorIfNull*/
-    Log.errorIfNull(o);
+    {
+     Preconditions.checkNotNull(o);
  
      /* generated by template ast.additionalmethods.EqualsWithComments*/
 
@@ -318,9 +311,8 @@ public  de.monticore.ast.ASTNode get_Children(){
   
    public  void remove_Child(de.monticore.ast.ASTNode child)
    
-    { 
-     /* generated by template ast.ErrorIfNull*/
-    Log.errorIfNull(child);
+    {
+     Preconditions.checkNotNull(child);
  
      /* generated by template ast.additionalmethods.RemoveChild*/
 
@@ -368,9 +360,8 @@ public  ASTClassDeclaration deepClone()
   
    public  ASTClassDeclaration deepClone(ASTClassDeclaration result)
    
-    { 
-     /* generated by template ast.ErrorIfNull*/
-    Log.errorIfNull(result);
+    {
+     Preconditions.checkNotNull(result);
  
      /* generated by template ast.additionalmethods.DeepCloneWithParameters*/
   
@@ -515,9 +506,8 @@ public  Optional<? extends Scope> getEnclosingScope()
   
    public  void setModifiers(de.monticore.javadsl.javadsl._ast.ASTModifierList modifiers)
    
-    { 
-     /* generated by template ast.ErrorIfNull*/
-    Log.errorIfNull(modifiers);
+    {
+     Preconditions.checkNotNull(modifiers);
  
      /* generated by template ast.additionalmethods.Set*/
 
@@ -529,9 +519,8 @@ public  void setModifiers(de.monticore.javadsl.javadsl._ast.ASTModifierList modi
   
    public  void setName(String name)
    
-    { 
-     /* generated by template ast.ErrorIfNull*/
-    Log.errorIfNull(name);
+    {
+     Preconditions.checkNotNull(name);
  
      /* generated by template ast.additionalmethods.Set*/
 
@@ -589,9 +578,8 @@ public  boolean superClassIsPresent()
   
    public  void setImplementedInterfaces(de.monticore.types.types._ast.ASTTypeList implementedInterfaces)
    
-    { 
-     /* generated by template ast.ErrorIfNull*/
-    Log.errorIfNull(implementedInterfaces);
+    {
+     Preconditions.checkNotNull(implementedInterfaces);
  
      /* generated by template ast.additionalmethods.Set*/
 
@@ -603,9 +591,8 @@ public  void setImplementedInterfaces(de.monticore.types.types._ast.ASTTypeList
   
    public  void setClassBody(de.monticore.javadsl.javadsl._ast.ASTClassBody classBody)
    
-    { 
-     /* generated by template ast.ErrorIfNull*/
-    Log.errorIfNull(classBody);
+    {
+     Preconditions.checkNotNull(classBody);
  
      /* generated by template ast.additionalmethods.Set*/
 
diff --git a/javaDSL/src/test/resources/typeSystemTestModels/monticore/invalid/Symbol.java b/javaDSL/src/test/resources/typeSystemTestModels/monticore/invalid/Symbol.java
index de448819..cddfadef 100644
--- a/javaDSL/src/test/resources/typeSystemTestModels/monticore/invalid/Symbol.java
+++ b/javaDSL/src/test/resources/typeSystemTestModels/monticore/invalid/Symbol.java
@@ -9,6 +9,7 @@
 import de.monticore.symboltable.modifiers.AccessModifier;
 import de.se_rwth.commons.SourcePosition;
 import de.se_rwth.commons.logging.Log;
+import com.google.common.base.Verify;
 
 import java.util.Optional;
 
@@ -24,7 +25,7 @@ public interface Symbol {
   SymbolKind getKind();
 
 //  default boolean isKindOf(SymbolKind kind) {
-//    return this.getKind().isKindOf((SymbolKind) Log.errorIfNull(kind));
+//    return this.getKind().isKindOf((SymbolKind) Verify.verifyNotNull(kind));
 //  }
 
 //  default AccessModifier getAccessModifier() {
diff --git a/javaDSL/src/test/resources/typeSystemTestModels/monticore/valid/Symbol.java b/javaDSL/src/test/resources/typeSystemTestModels/monticore/valid/Symbol.java
index 4da5f423..36cb3d9e 100644
--- a/javaDSL/src/test/resources/typeSystemTestModels/monticore/valid/Symbol.java
+++ b/javaDSL/src/test/resources/typeSystemTestModels/monticore/valid/Symbol.java
@@ -9,6 +9,7 @@
 import de.monticore.symboltable.modifiers.AccessModifier;
 import de.se_rwth.commons.SourcePosition;
 import de.se_rwth.commons.logging.Log;
+import com.google.common.base.Verify;
 
 import java.util.Optional;
 
@@ -22,7 +23,7 @@ public interface Symbol {
   SymbolKind getKind();
 
 //  default boolean isKindOf(SymbolKind kind) {
-//    return this.getKind().isKindOf((SymbolKind) Log.errorIfNull(kind));
+//    return this.getKind().isKindOf((SymbolKind) Verify.verifyNotNull(kind));
 //  }
 
 //  default AccessModifier getAccessModifier() {