diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java
index 5557b1e9f47..cc3cec80bc4 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/kotlinSignature/SignaturesPropagationData.java
@@ -17,7 +17,6 @@
 package org.jetbrains.jet.lang.resolve.java.kotlinSignature;
 
 import com.google.common.collect.*;
-import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.diagnostic.Logger;
 import com.intellij.openapi.util.Pair;
 import com.intellij.openapi.util.SystemInfo;
@@ -655,16 +654,11 @@ public class SignaturesPropagationData {
     private static void reportCantFindSuperFunction(PsiMethodWrapper method) {
         String errorMessage = "Can't find super function for " + method.getPsiMethod() +
                               " defined in " + method.getPsiMethod().getContainingClass();
-        if (ApplicationManager.getApplication().isUnitTestMode()) {
-            throw new IllegalStateException(errorMessage);
+        if (SystemInfo.isMac) {
+            LOG.error("Remove duplicates from your JDK definition\n" + errorMessage);
         }
         else {
-            if (SystemInfo.isMac) {
-                LOG.error("Remove duplicates from your JDK definition\n" + errorMessage);
-            }
-            else {
-                LOG.error(errorMessage);
-            }
+            LOG.error(errorMessage);
         }
     }
 
diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
index a7311f451f8..00011f027b8 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/resolver/JavaFunctionResolver.java
@@ -243,20 +243,13 @@ public final class JavaFunctionResolver {
             boolean returnTypeOk =
                     isReturnTypeOkForOverride(JetTypeChecker.INSTANCE, superFunctionSubstituted, functionDescriptor);
             if (!paramsOk || !returnTypeOk) {
-                String errorMessage = "Loaded Java method overrides another, but resolved as Kotlin function, doesn't.\n"
-                                      + "super function = " + superFunction + "\n"
-                                      + "super class = " + superFunction.getContainingDeclaration() + "\n"
-                                      + "sub function = " + functionDescriptor + "\n"
-                                      + "sub class = " + functionDescriptor.getContainingDeclaration() + "\n"
-                                      + "sub method = " + PsiFormatUtil.getExternalName(method.getPsiMethod()) + "\n"
-                                      + "@KotlinSignature = " + method.getSignatureAnnotation().signature();
-
-                if (ApplicationManager.getApplication().isUnitTestMode()) {
-                    throw new IllegalStateException(errorMessage);
-                }
-                else {
-                    LOG.error(errorMessage);
-                }
+                LOG.error("Loaded Java method overrides another, but resolved as Kotlin function, doesn't.\n"
+                          + "super function = " + superFunction + "\n"
+                          + "super class = " + superFunction.getContainingDeclaration() + "\n"
+                          + "sub function = " + functionDescriptor + "\n"
+                          + "sub class = " + functionDescriptor.getContainingDeclaration() + "\n"
+                          + "sub method = " + PsiFormatUtil.getExternalName(method.getPsiMethod()) + "\n"
+                          + "@KotlinSignature = " + method.getSignatureAnnotation().signature());
             }
         }
     }
diff --git a/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java b/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
index f28011548be..21d32d41fa7 100644
--- a/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
+++ b/idea/src/org/jetbrains/jet/plugin/highlighter/JetPsiChecker.java
@@ -134,9 +134,6 @@ public class JetPsiChecker implements Annotator {
                 // For failing tests and to notify about idea internal error in -ea mode
                 holder.createErrorAnnotation(element, e.getClass().getCanonicalName() + ": " + e.getMessage());
                 LOG.error(e);
-                if (ApplicationManager.getApplication().isUnitTestMode()) {
-                    throw ExceptionUtils.rethrow(e);
-                }
             }
         }
     }