diff --git a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java b/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
index 4d860102f73..432f386f671 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
@@ -25,6 +25,7 @@ import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentException;
 import org.jetbrains.jet.cli.jvm.compiler.CompileEnvironmentUtil;
 
 import java.io.PrintStream;
+import java.util.Collections;
 import java.util.List;
 
 import static org.jetbrains.jet.cli.common.ExitCode.INTERNAL_ERROR;
@@ -50,6 +51,9 @@ public abstract class CLICompiler<A extends CompilerArguments, C extends Compile
     protected boolean parseArguments(@NotNull PrintStream errStream, @NotNull A arguments, @NotNull String[] args) {
         try {
             arguments.freeArgs = Args.parse(arguments, args);
+            if (arguments.freeArgs == null) {
+                arguments.freeArgs = Collections.emptyList();
+            }
             return true;
         }
         catch (IllegalArgumentException e) {