diff --git a/build.gradle b/build.gradle
index 077532e1c693141ca00a5add63e9d9a6e62cba7d..613dfdfafc822ebe5c972b3ff6c66a875c366a62 100644
--- a/build.gradle
+++ b/build.gradle
@@ -41,7 +41,7 @@ jar {
     }
 
     from {
-        configurations.runtimeClasspath.collect { return (it.exists() && !it.toString().endsWith("model.jar")) ? (it.isDirectory() ? it : zipTree(it)) : null }
+        configurations.runtimeClasspath.collect { return (it.exists() && (!it.toString().contains("/build/libs/")|| it.toString().contains("-base-"))) ? (it.isDirectory() ? it : zipTree(it)) : null }
     }
 }
 
@@ -143,3 +143,4 @@ jastadd {
 
 clean.dependsOn(cleanGen)
 generateAst.dependsOn(relast)
+jar.dependsOn("relast.preprocessor:jar") // the jar is a fat jar that contains the jar of the preprocessor
\ No newline at end of file
diff --git a/relast.preprocessor b/relast.preprocessor
index b4fe30b62b9e891c20497af3e92614dd07c8d8b1..4b4b7798e65fae598958afb4e33a1d9b0938be58 160000
--- a/relast.preprocessor
+++ b/relast.preprocessor
@@ -1 +1 @@
-Subproject commit b4fe30b62b9e891c20497af3e92614dd07c8d8b1
+Subproject commit 4b4b7798e65fae598958afb4e33a1d9b0938be58
diff --git a/src/main/java/org/jastadd/preprocessor/Main.java b/src/main/java/org/jastadd/preprocessor/Main.java
index 4830eb12bcfe7bcf94bea7c7efbfec83418b2aeb..66005eb99cec83a048ab953474f81a799f7132c5 100644
--- a/src/main/java/org/jastadd/preprocessor/Main.java
+++ b/src/main/java/org/jastadd/preprocessor/Main.java
@@ -88,6 +88,7 @@ public class Main extends org.jastadd.relast.compiler.RelAstProcessor {
         }
     }
 
+
     Document navigation = program.toNavigation(useExceptions, useOptionals, exceptionName);
 
     Path yamlFile = outputBasePath.resolve(navigation.getFileName());
@@ -103,6 +104,7 @@ public class Main extends org.jastadd.relast.compiler.RelAstProcessor {
       throw new CompilerException("Unable to expand template", e);
     }
 
+
     for (GrammarFile grammarFile : program.getGrammarFileList()) {
       printMessage("Writing output file " + grammarFile.getFileName());
       // TODO decide and document what the file name should be, the full path or a simple name?
diff --git a/src/test/resources/AddEmptyDeclaration/config.yaml b/src/test/resources/AddEmptyDeclaration/config.yaml
index 17e4646573e269287c2454fde915728c85f56953..50f2c5215ca8b11c8b478b567f83dc9e8be3d655 100644
--- a/src/test/resources/AddEmptyDeclaration/config.yaml
+++ b/src/test/resources/AddEmptyDeclaration/config.yaml
@@ -3,6 +3,4 @@
   args:
     - "--inputBaseDir=in"
     - "--outputBaseDir=out"
-    - "--errorHandling=null"
     - "Example.relast"
-    - "EmptyDeclaration.relast"