diff --git a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java
index d835ae6df3f..d035ee26b3f 100644
--- a/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java
+++ b/compiler/cli/src/org/jetbrains/kotlin/cli/jvm/K2JVMCompiler.java
@@ -95,10 +95,13 @@ public class K2JVMCompiler extends CLICompiler<K2JVMCompilerArguments> {
             PluginCliParser.loadPlugins(arguments, configuration);
         }
         catch (CliOptionProcessingException e) {
-            // TODO Print usage?
             messageCollector.report(CompilerMessageSeverity.ERROR, e.getMessage(), CompilerMessageLocation.NO_LOCATION);
             return INTERNAL_ERROR;
         }
+        catch (Throwable t) {
+            MessageCollectorUtil.reportException(messageCollector, t);
+            return INTERNAL_ERROR;
+        }
 
         if (arguments.script) {
             if (arguments.freeArgs.isEmpty()) {