diff --git a/java/buildSrc/src/main/groovy/brapi.schema-tools.java-conventions.gradle b/java/buildSrc/src/main/groovy/brapi.schema-tools.java-conventions.gradle
index 3c2fcf9..e9fc3ea 100644
--- a/java/buildSrc/src/main/groovy/brapi.schema-tools.java-conventions.gradle
+++ b/java/buildSrc/src/main/groovy/brapi.schema-tools.java-conventions.gradle
@@ -3,7 +3,7 @@ plugins {
 }
 
 group = 'org.brapi'
-version = '0.6.0-SNAPSHOT'
+version = '0.7.0-SNAPSHOT'
 sourceCompatibility = JavaVersion.VERSION_21
 targetCompatibility = JavaVersion.VERSION_21
 
diff --git a/java/cli/src/main/java/org/brapi/schematools/cli/BrAPICommand.java b/java/cli/src/main/java/org/brapi/schematools/cli/BrAPICommand.java
index d836609..ec1514c 100644
--- a/java/cli/src/main/java/org/brapi/schematools/cli/BrAPICommand.java
+++ b/java/cli/src/main/java/org/brapi/schematools/cli/BrAPICommand.java
@@ -22,7 +22,7 @@ public class BrAPICommand {
      * Main method for application
      * @param args arguments for application
      */
-    public static void main(String[] args) {
-        new CommandLine(new BrAPICommand()).execute(args);
+    public static void main(String... args) throws Exception {
+        System.exit(new CommandLine(new BrAPICommand()).execute(args));
     }
 }
\ No newline at end of file
diff --git a/java/cli/src/main/java/org/brapi/schematools/cli/BrAPICommandException.java b/java/cli/src/main/java/org/brapi/schematools/cli/BrAPICommandException.java
index 26fd6ab..6e7e6dc 100644
--- a/java/cli/src/main/java/org/brapi/schematools/cli/BrAPICommandException.java
+++ b/java/cli/src/main/java/org/brapi/schematools/cli/BrAPICommandException.java
@@ -3,11 +3,18 @@
 import lombok.Getter;
 import org.brapi.schematools.core.response.Response;
 
+import java.util.ArrayList;
 import java.util.Collection;
+import java.util.Collections;
 
 @Getter
 public class BrAPICommandException extends RuntimeException {
     Collection<Response.Error> allErrors ;
+    public BrAPICommandException(String message) {
+        super(message) ;
+
+        this.allErrors = new ArrayList<>() ;
+    }
 
     public BrAPICommandException(String message, Collection<Response.Error> allErrors) {
         super(message) ;
diff --git a/java/cli/src/main/java/org/brapi/schematools/cli/GenerateSubCommand.java b/java/cli/src/main/java/org/brapi/schematools/cli/GenerateSubCommand.java
index 6c89ad4..ba76851 100644
--- a/java/cli/src/main/java/org/brapi/schematools/cli/GenerateSubCommand.java
+++ b/java/cli/src/main/java/org/brapi/schematools/cli/GenerateSubCommand.java
@@ -100,6 +100,9 @@ public void run() {
             }
         } catch (IOException exception) {
             err.println(exception.getMessage());
+            if (throwExceptionOnFail) {
+                throw new BrAPICommandException(exception.getMessage()) ;
+            }
         } finally {
             if (out != null) {
                 out.close();