diff --git a/idea/src/org/jetbrains/jet/codegen/FunctionCodegen.java b/idea/src/org/jetbrains/jet/codegen/FunctionCodegen.java
index 484611fde09..44be171aafd 100644
--- a/idea/src/org/jetbrains/jet/codegen/FunctionCodegen.java
+++ b/idea/src/org/jetbrains/jet/codegen/FunctionCodegen.java
@@ -8,7 +8,7 @@ import org.jetbrains.jet.lang.psi.JetDeclarationWithBody;
 import org.jetbrains.jet.lang.psi.JetExpression;
 import org.jetbrains.jet.lang.psi.JetNamedFunction;
 import org.jetbrains.jet.lang.resolve.BindingContext;
-import org.jetbrains.jet.lang.types.JetTypeImpl;
+import org.jetbrains.jet.lang.types.TypeUtils;
 import org.objectweb.asm.ClassVisitor;
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Opcodes;
@@ -135,7 +135,7 @@ public class FunctionCodegen {
             if(overriddenFunctions.size() > 0) {
                 for (FunctionDescriptor overriddenFunction : overriddenFunctions) {
                     // TODO should we check params here as well?
-                    if(!JetTypeImpl.equalTypeClasses(overriddenFunction.getOriginal().getReturnType(), functionDescriptor.getReturnType())) {
+                    if(!TypeUtils.equalClasses(overriddenFunction.getOriginal().getReturnType(), functionDescriptor.getReturnType())) {
                         generateBridgeMethod(jvmSignature, state.getTypeMapper().mapSignature(overriddenFunction.getName(), overriddenFunction.getOriginal()));
                     }
                 }
diff --git a/idea/src/org/jetbrains/jet/lang/types/JetTypeImpl.java b/idea/src/org/jetbrains/jet/lang/types/JetTypeImpl.java
index cbdc61d7e5f..4d7945db4c4 100644
--- a/idea/src/org/jetbrains/jet/lang/types/JetTypeImpl.java
+++ b/idea/src/org/jetbrains/jet/lang/types/JetTypeImpl.java
@@ -3,10 +3,9 @@ package org.jetbrains.jet.lang.types;
 import com.google.common.collect.BiMap;
 import com.google.common.collect.HashBiMap;
 import org.jetbrains.annotations.NotNull;
-import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
+import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotatedImpl;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
-import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.resolve.JetScope;
 
 import java.util.Collections;
@@ -114,11 +113,6 @@ public final class JetTypeImpl extends AnnotatedImpl implements JetType {
         return result;
     }
 
-
-    public static boolean equalTypeClasses(@NotNull JetType type1, @NotNull JetType type2) {
-        return type1.getConstructor().getDeclarationDescriptor().getOriginal().equals(type2.getConstructor().getDeclarationDescriptor().getOriginal());
-    }
-
     public static boolean equalTypes(@NotNull JetType type1, @NotNull JetType type2, @NotNull BiMap<TypeConstructor, TypeConstructor> equalityAxioms) {
         if (type1.isNullable() != type2.isNullable()) {
             return false;
diff --git a/idea/src/org/jetbrains/jet/lang/types/TypeUtils.java b/idea/src/org/jetbrains/jet/lang/types/TypeUtils.java
index c20be85a0c1..10215de1dec 100644
--- a/idea/src/org/jetbrains/jet/lang/types/TypeUtils.java
+++ b/idea/src/org/jetbrains/jet/lang/types/TypeUtils.java
@@ -5,6 +5,7 @@ import com.google.common.collect.Maps;
 import com.google.common.collect.Sets;
 import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
+import org.jetbrains.jet.lang.descriptors.DeclarationDescriptor;
 import org.jetbrains.jet.lang.descriptors.annotations.AnnotationDescriptor;
 import org.jetbrains.jet.lang.descriptors.ClassDescriptor;
 import org.jetbrains.jet.lang.descriptors.TypeParameterDescriptor;
@@ -311,4 +312,12 @@ public class TypeUtils {
         }
         return false;
     }
+
+    public static boolean equalClasses(@NotNull JetType type1, @NotNull JetType type2) {
+        DeclarationDescriptor declarationDescriptor1 = type1.getConstructor().getDeclarationDescriptor();
+        if (declarationDescriptor1 == null) return false; // No class, classes are not equal
+        DeclarationDescriptor declarationDescriptor2 = type2.getConstructor().getDeclarationDescriptor();
+        if (declarationDescriptor2 == null) return false; // Class of type1 is not null
+        return declarationDescriptor1.getOriginal().equals(declarationDescriptor2.getOriginal());
+    }
 }