diff --git a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqName.java b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqName.java
index 16bc51ce106..a6cfecb855f 100644
--- a/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqName.java
+++ b/compiler/frontend/src/org/jetbrains/jet/lang/resolve/name/FqName.java
@@ -155,20 +155,18 @@ public class FqName extends FqNameBase {
 
     @Override
     public boolean equals(Object o) {
-        // generated by Idea
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
 
-        FqName that = (FqName) o;
+        FqName otherFqName = (FqName) o;
 
-        if (fqName != null ? !fqName.equals(that.fqName) : that.fqName != null) return false;
+        if (!fqName.equals(otherFqName.fqName)) return false;
 
         return true;
     }
 
     @Override
     public int hashCode() {
-        // generated by Idea
-        return fqName != null ? fqName.hashCode() : 0;
+        return fqName.hashCode();
     }
 }