diff --git a/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java b/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
index 2b90fa99c14b..52c02f467ff7 100644
--- a/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
+++ b/jps/jps-builders/testSrc/org/jetbrains/ether/IncrementalTestCase.java
@@ -271,7 +271,7 @@ public abstract class IncrementalTestCase extends TestCase {
 
         rebuildDump.close();
 
-        //assertEquals(rebuildDump.toString(), makeDump.toString());
+        assertEquals(rebuildDump.toString(), makeDump.toString());
       }
     }
     finally {
diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/IntIntMultiMaplet.java b/jps/model/src/org/jetbrains/ether/dependencyView/IntIntMultiMaplet.java
index dfa667017125..52fbf6bd1df3 100644
--- a/jps/model/src/org/jetbrains/ether/dependencyView/IntIntMultiMaplet.java
+++ b/jps/model/src/org/jetbrains/ether/dependencyView/IntIntMultiMaplet.java
@@ -74,6 +74,10 @@ abstract class IntIntMultiMaplet implements Streamable {
     for (final int a : keys) {
       final TIntHashSet b = get(a);
 
+      if (b.size() == 0) {
+        continue;
+      }
+
       stream.print("  Key: ");
       stream.println(context.getValue(a));
       stream.println("  Values:");
diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/IntObjectMultiMaplet.java b/jps/model/src/org/jetbrains/ether/dependencyView/IntObjectMultiMaplet.java
index cd4fcd809e56..ea38d84bf96a 100644
--- a/jps/model/src/org/jetbrains/ether/dependencyView/IntObjectMultiMaplet.java
+++ b/jps/model/src/org/jetbrains/ether/dependencyView/IntObjectMultiMaplet.java
@@ -73,6 +73,11 @@ abstract class IntObjectMultiMaplet<V extends Streamable> implements Streamable
 
     for (final int a : keys) {
       final Collection<V> b = get(a);
+
+      if (b.size() == 0) {
+        continue;
+      }
+
       stream.print("  Key: ");
       stream.println(context.getValue(a));
       stream.println("  Values:");
diff --git a/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java b/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
index af3d290d61e3..38eb8a589554 100644
--- a/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
+++ b/jps/model/src/org/jetbrains/ether/dependencyView/Mappings.java
@@ -1995,10 +1995,25 @@ public class Mappings {
             cleanupRemovedClass(delta, repr, null, dependenciesTrashBin);
           }
 
+          delta.getRemovedSuperClasses().forEachEntry(new TIntObjectProcedure<TIntHashSet>() {
+            @Override
+            public boolean execute(final int a, final TIntHashSet b) {
+              if (!compiledClasses.contains(a)) {
+                final TIntHashSet old = myClassToSubclasses.get(a);
+
+                if (old != null) {
+                  old.removeAll(b.toArray());
+                  myClassToSubclasses.replace(a, old);
+                }
+              }
+
+              return true;
+            }
+          });
+
           delta.myClassToSubclasses.forEachEntry(new TIntObjectProcedure<TIntHashSet>() {
             @Override
-            public boolean execute(final int className, final TIntHashSet s) {
-              final TIntHashSet newSubClasses = s == null ? new TIntHashSet() : s;
+            public boolean execute(final int className, final TIntHashSet newSubClasses) {
               final TIntHashSet oldSubClasses = myClassToSubclasses.get(className);
 
               if (oldSubClasses != null) {
@@ -2074,22 +2089,6 @@ public class Mappings {
               return true;
             }
           });
-
-          delta.getRemovedSuperClasses().forEachEntry(new TIntObjectProcedure<TIntHashSet>() {
-            @Override
-            public boolean execute(final int a, final TIntHashSet b) {
-              if (!compiledClasses.contains(a)) {
-                final TIntHashSet old = myClassToSubclasses.get(a);
-
-                if (old != null) {
-                  old.removeAll(b.toArray());
-                  myClassToSubclasses.replace(a, old);
-                }
-              }
-
-              return true;
-            }
-          });
         }
         else {
           myClassToSubclasses.putAll(delta.myClassToSubclasses);