diff --git a/se-commons-codestyle/build.gradle b/se-commons-codestyle/build.gradle
index 44dff7c..c368dcd 100644
--- a/se-commons-codestyle/build.gradle
+++ b/se-commons-codestyle/build.gradle
@@ -10,6 +10,7 @@ description = 'se-commons: codestyle'
 dependencies {
   implementation gradleApi()
   implementation "com.diffplug.spotless:spotless-plugin-gradle:6.25.0"
+  implementation "com.google.guava:guava:$guava_version"
 }
 
 repositories {
diff --git a/se-commons-codestyle/src/main/java/de/se_rwth/codestyle/ExtractCodeStyleFileTask.java b/se-commons-codestyle/src/main/java/de/se_rwth/codestyle/ExtractCodeStyleFileTask.java
index 8b44be5..31f81f4 100644
--- a/se-commons-codestyle/src/main/java/de/se_rwth/codestyle/ExtractCodeStyleFileTask.java
+++ b/se-commons-codestyle/src/main/java/de/se_rwth/codestyle/ExtractCodeStyleFileTask.java
@@ -9,11 +9,10 @@
 import org.gradle.api.tasks.Input;
 import org.gradle.api.tasks.OutputFile;
 import org.gradle.api.tasks.TaskAction;
-
+import com.google.common.base.Preconditions;
 import java.io.IOException;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
-import java.util.Objects;
 
 /**
  * This task just extracts a file from the resources
@@ -29,8 +28,8 @@ public abstract class ExtractCodeStyleFileTask extends DefaultTask {
   
   @TaskAction
   public void store() throws IOException {
-    Files.copy(Objects.requireNonNull(
-            ExtractCodeStyleFileTask.class.getClassLoader().getResourceAsStream(getInput().get())),
+    Files.copy(Preconditions.checkNotNull(
+               ExtractCodeStyleFileTask.class.getClassLoader().getResourceAsStream(getInput().get())),
         getDestination().get().getAsFile().toPath(), StandardCopyOption.REPLACE_EXISTING);
   }
 }
diff --git a/se-commons-codestyle/src/main/java/de/se_rwth/codestyle/SECodeStylePlugin.java b/se-commons-codestyle/src/main/java/de/se_rwth/codestyle/SECodeStylePlugin.java
index 0d1c606..3810b50 100644
--- a/se-commons-codestyle/src/main/java/de/se_rwth/codestyle/SECodeStylePlugin.java
+++ b/se-commons-codestyle/src/main/java/de/se_rwth/codestyle/SECodeStylePlugin.java
@@ -6,16 +6,13 @@
 import org.gradle.api.Plugin;
 import org.gradle.api.Project;
 import org.gradle.api.UnknownTaskException;
-import org.gradle.api.file.RegularFile;
-import org.gradle.api.provider.Provider;
-
+import com.google.common.base.Preconditions;
 import javax.annotation.Nonnull;
 import java.io.File;
 import java.io.IOException;
 import java.io.InputStream;
 import java.nio.file.Files;
 import java.nio.file.StandardCopyOption;
-import java.util.Objects;
 
 /**
  * This plugin applies & configures the spotless code formatter,
@@ -108,7 +105,7 @@ public void apply(@Nonnull Project project) {
         try (
             InputStream url = getClass().getClassLoader()
                 .getResourceAsStream("se-codestyle/.editorconfig")) {
-          Files.copy(Objects.requireNonNull(url), editorConfig.toPath(),
+          Files.copy(Preconditions.checkNotNull(url), editorConfig.toPath(),
               StandardCopyOption.REPLACE_EXISTING);
         }
       }
diff --git a/se-commons-gradle/src/main/java/de/monticore/gradle/queue/CachedQueueService.java b/se-commons-gradle/src/main/java/de/monticore/gradle/queue/CachedQueueService.java
index ada7f3d..7e86929 100644
--- a/se-commons-gradle/src/main/java/de/monticore/gradle/queue/CachedQueueService.java
+++ b/se-commons-gradle/src/main/java/de/monticore/gradle/queue/CachedQueueService.java
@@ -1,6 +1,7 @@
 /* (c) https://github.com/MontiCore/monticore */
 package de.monticore.gradle.queue;
 
+import com.google.common.base.Preconditions;
 import com.google.gson.Gson;
 import de.monticore.gradle.internal.io.PrefixStream;
 import de.monticore.gradle.internal.io.PrintStreamThreadProxy;
@@ -76,10 +77,10 @@ protected void init(ServiceRegistry serviceRegistry) {
       logger.warn("Possibly overriding the CachedQueueService instance");
       INSTANCE = this;
     }
-    this.serviceRegistry = Objects.requireNonNull(serviceRegistry);
+    this.serviceRegistry = Preconditions.checkNotNull(serviceRegistry);
     this.providerSelf = (Provider<CachedQueueService>) serviceRegistry.get(BuildServiceRegistry.class).getRegistrations().getByName(NAME).getService();
-    Objects.requireNonNull(serviceRegistry.get(ActionExecutionSpecFactory.class), "ActionExecutionSpecFactory");
-    Objects.requireNonNull(serviceRegistry.get(IsolatableFactory.class), "isolatableFactory");
+    Preconditions.checkNotNull(serviceRegistry.get(ActionExecutionSpecFactory.class), "ActionExecutionSpecFactory");
+    Preconditions.checkNotNull(serviceRegistry.get(IsolatableFactory.class), "isolatableFactory");
 
     serviceRegistry.get(BuildEventListenerRegistryInternal.class)
             .onOperationCompletion(this.providerSelf);
@@ -635,7 +636,7 @@ public void markForErasure() {
 
 
   /**
-   * Construc
+   * Constructor for a new WorkQueue
    *
    * @param workerExecutor        the worker executor to use
    * @param extraClasspathElement the classpath elements to use
@@ -644,7 +645,7 @@ public void markForErasure() {
   public WorkQueue newWorkQueue(WorkerExecutor workerExecutor, FileCollection extraClasspathElement) {
     return new CachedIsolatedWorkQueue(workerExecutor.noIsolation(),
             serviceRegistry.get(InstantiatorFactory.class),
-            Objects.requireNonNull(serviceRegistry, "serviceRegistry"),
+            Preconditions.checkNotNull(serviceRegistry, "serviceRegistry"),
             this.providerSelf,
             extraClasspathElement);
   }
diff --git a/se-commons-groovy/src/main/java/de/se_rwth/commons/groovy/DelegatingClassLoader.java b/se-commons-groovy/src/main/java/de/se_rwth/commons/groovy/DelegatingClassLoader.java
index 5c3787f..e481221 100644
--- a/se-commons-groovy/src/main/java/de/se_rwth/commons/groovy/DelegatingClassLoader.java
+++ b/se-commons-groovy/src/main/java/de/se_rwth/commons/groovy/DelegatingClassLoader.java
@@ -1,6 +1,8 @@
 /* (c) https://github.com/MontiCore/monticore */
 package de.se_rwth.commons.groovy;
 
+import com.google.common.base.Preconditions;
+
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
@@ -45,7 +47,7 @@ public DelegatingClassLoader(ClassLoader delegate) {
 
   @Override
   public Class<?> loadClass(String name) throws ClassNotFoundException {
-    return Objects.requireNonNull(delegate.get()).loadClass(name);
+    return Preconditions.checkNotNull(delegate.get()).loadClass(name);
   }
 
   @Override
@@ -65,23 +67,23 @@ protected Class<?> loadClass(String name, boolean resolve) throws ClassNotFoundE
 
   @Override
   public URL getResource(String name) {
-    return Objects.requireNonNull(delegate.get()).getResource(name);
+    return Preconditions.checkNotNull(delegate.get()).getResource(name);
   }
 
   @Override
   public Enumeration<URL> getResources(String name) throws IOException {
-    return Objects.requireNonNull(delegate.get()).getResources(name);
+    return Preconditions.checkNotNull(delegate.get()).getResources(name);
   }
 
 // Enable with language level 9
 //  @Override
 //  public Stream<URL> resources(String name) {
-//    return Objects.requireNonNull(delegate.get()).resources(name);
+//    return Preconditions.checkNotNull(delegate.get()).resources(name);
 //  }
 
   @Override
   public InputStream getResourceAsStream(String name) {
-    return Objects.requireNonNull(delegate.get()).getResourceAsStream(name);
+    return Preconditions.checkNotNull(delegate.get()).getResourceAsStream(name);
   }
 
   @Override