diff --git a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java
index 45935dcbcbb..09664a6cfd6 100644
--- a/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java
+++ b/idea/src/org/jetbrains/jet/plugin/compiler/JetCompilerManager.java
@@ -16,6 +16,8 @@
 
 package org.jetbrains.jet.plugin.compiler;
 
+import com.intellij.diagnostic.PluginException;
+import com.intellij.ide.plugins.PluginManager;
 import com.intellij.openapi.compiler.*;
 import com.intellij.openapi.components.ProjectComponent;
 import com.intellij.openapi.diagnostic.Logger;
@@ -25,6 +27,8 @@ import com.intellij.openapi.project.Project;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.jet.plugin.JetFileType;
 
+import java.io.PrintStream;
+import java.io.PrintWriter;
 import java.util.Collections;
 
 import static org.jetbrains.jet.compiler.runner.CompilerRunnerConstants.INTERNAL_ERROR_PREFIX;
@@ -54,9 +58,9 @@ public class JetCompilerManager implements ProjectComponent {
                     boolean aborted, int errors, int warnings, CompileContext compileContext
             ) {
                 for (CompilerMessage error : compileContext.getMessages(CompilerMessageCategory.ERROR)) {
-                    String message = error.getMessage();
+                    final String message = error.getMessage();
                     if (message.startsWith(INTERNAL_ERROR_PREFIX) || message.startsWith(PREFIX_WITH_COMPILER_NAME)) {
-                        LOG.error(message);
+                        LOG.error(new KotlinCompilerException(message));
                     }
                 }
             }
@@ -88,4 +92,41 @@ public class JetCompilerManager implements ProjectComponent {
     public String getComponentName() {
         return JetCompilerManager.class.getCanonicalName();
     }
+
+    // Extending PluginException ensures that Exception Analyzer recognizes this as a Kotlin exception
+    private static class KotlinCompilerException extends PluginException {
+        private final String text;
+
+        public KotlinCompilerException(String text) {
+            super("", PluginManager.getPluginByClassName(JetCompilerManager.class.getName()));
+            this.text = text;
+        }
+
+        @Override
+        public void printStackTrace(PrintWriter s) {
+            s.print(text);
+        }
+
+        @Override
+        public void printStackTrace(PrintStream s) {
+            s.print(text);
+        }
+
+        @Override
+        public synchronized Throwable fillInStackTrace() {
+            return this;
+        }
+
+        @Override
+        public StackTraceElement[] getStackTrace() {
+            LOG.error("Somebody called getStackTrace() on KotlinCompilerException");
+            // Return some stack trace that originates in Kotlin
+            return new UnsupportedOperationException().getStackTrace();
+        }
+
+        @Override
+        public String getMessage() {
+            return "<Exception from standalone Kotlin compiler>";
+        }
+    }
 }