diff --git a/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java b/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java
index 7c0189ca..5423de55 100644
--- a/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java
+++ b/src/main/java/com/checkmarx/ast/wrapper/CxConfig.java
@@ -57,8 +57,8 @@ List<String> toArguments() {
             commands.add(CxConstants.BASE_AUTH_URI);
             commands.add(getBaseAuthUri());
         }
-
-        commands.addAll(getAdditionalParameters());
+        if (getAdditionalParameters() != null)
+            commands.addAll(getAdditionalParameters());
 
         return commands;
     }