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 96e0f74b420..a4e67c95285 100644
--- a/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
+++ b/compiler/cli/src/org/jetbrains/jet/cli/common/CLICompiler.java
@@ -152,10 +152,12 @@ public abstract class CLICompiler<A extends CompilerArguments> {
             ExitCode rc = compiler.exec(System.out, args);
             if (rc != OK) {
                 System.err.println("exec() finished with " + rc + " return code");
-                //System.err.println("Command line arguments: ");
-                //for (String arg : args) {
-                //    System.err.println(arg);
-                //}
+                if (Boolean.parseBoolean(System.getProperty("kotlin.print.cmd.args"))) {
+                    System.err.println("Command line arguments: ");
+                    for (String arg : args) {
+                        System.err.println(arg);
+                    }
+                }
                 System.exit(rc.getCode());
             }
         }