diff --git a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
index 37c13801cc0..f5063500f7f 100644
--- a/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
+++ b/compiler/frontend.java/src/org/jetbrains/jet/lang/resolve/java/JavaDescriptorResolver.java
@@ -419,7 +419,7 @@ public class JavaDescriptorResolver {
 
     static void checkPsiClassIsNotJet(PsiClass psiClass) {
         if (psiClass instanceof JetJavaMirrorMarker) {
-            throw new IllegalStateException("trying to resolve fake jet PsiClass as regular PsiClass");
+            throw new IllegalStateException("trying to resolve fake jet PsiClass as regular PsiClass: " + psiClass);
         }
     }
 
diff --git a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java
index 2cc50f58962..234b001ecfe 100644
--- a/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java
+++ b/compiler/jet.as.java.psi/src/org/jetbrains/jet/asJava/JetLightClass.java
@@ -209,4 +209,13 @@ public class JetLightClass extends AbstractLightClass implements JetJavaMirrorMa
     public Icon getElementIcon(final int flags) {
         return PsiClassImplUtil.getClassIcon(flags, this);
     }
+
+    @Override
+    public String toString() {
+        try {
+            return JetLightClass.class.getSimpleName() + ":" + getQualifiedName();
+        } catch (Throwable e) {
+            return JetLightClass.class.getSimpleName() + ":" + e.toString();
+        }
+    }
 }