diff --git a/idea/src/META-INF/plugin.xml b/idea/src/META-INF/plugin.xml
index f7511ef34e8..27f9f17ac9f 100644
--- a/idea/src/META-INF/plugin.xml
+++ b/idea/src/META-INF/plugin.xml
@@ -222,6 +222,8 @@
       <definitionsSearch implementation="org.jetbrains.jet.plugin.search.KotlinDefinitionsSearcher"/>
       <annotatedElementsSearch implementation="org.jetbrains.jet.plugin.search.KotlinAnnotatedElementsSearcher"/>
 
+      <exceptionFilter implementation="org.jetbrains.jet.plugin.filters.JetExceptionFilterFactory" order="first"/>
+
       <toolWindow id="Kotlin"
                   factoryClass="org.jetbrains.jet.plugin.internal.KotlinInternalToolWindowFactory"
                   anchor="right"
diff --git a/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilter.java b/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilter.java
new file mode 100644
index 00000000000..0e9354e2b01
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilter.java
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.plugin.filters;
+
+import com.intellij.execution.filters.ExceptionFilter;
+import com.intellij.execution.filters.Filter;
+import com.intellij.execution.filters.HyperlinkInfo;
+import com.intellij.psi.search.GlobalSearchScope;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+public class JetExceptionFilter implements Filter {
+    @NotNull private final ExceptionFilter exceptionFilter;
+
+    public JetExceptionFilter(@NotNull GlobalSearchScope searchScope) {
+        exceptionFilter = new ExceptionFilter(searchScope);
+    }
+
+    @Nullable
+    private HyperlinkInfo createHyperlinkInfo(@NotNull String line) {
+        return null;
+    }
+
+    @NotNull
+    private Result patchResult(@NotNull Result result, @NotNull String line) {
+        HyperlinkInfo newHyperlinkInfo = createHyperlinkInfo(line);
+        return newHyperlinkInfo == null ? result :
+               new Result(result.highlightStartOffset, result.highlightEndOffset, newHyperlinkInfo, result.highlightAttributes);
+    }
+
+    @Nullable
+    @Override
+    public Result applyFilter(String line, int entireLength) {
+        Result result = exceptionFilter.applyFilter(line, entireLength);
+        return result == null ? null : patchResult(result, line);
+    }
+}
diff --git a/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilterFactory.java b/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilterFactory.java
new file mode 100644
index 00000000000..d07bcb39733
--- /dev/null
+++ b/idea/src/org/jetbrains/jet/plugin/filters/JetExceptionFilterFactory.java
@@ -0,0 +1,30 @@
+/*
+ * Copyright 2010-2012 JetBrains s.r.o.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.jetbrains.jet.plugin.filters;
+
+import com.intellij.execution.filters.ExceptionFilterFactory;
+import com.intellij.execution.filters.Filter;
+import com.intellij.psi.search.GlobalSearchScope;
+import org.jetbrains.annotations.NotNull;
+
+public class JetExceptionFilterFactory implements ExceptionFilterFactory {
+    @NotNull
+    @Override
+    public Filter create(GlobalSearchScope searchScope) {
+        return new JetExceptionFilter(searchScope);
+    }
+}