diff --git a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java
index b6f1d08b2111..af9e4481d1bf 100644
--- a/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java
+++ b/java/java-indexing-impl/src/com/intellij/psi/impl/search/JavaClassInheritorsSearcher.java
@@ -64,11 +64,15 @@ public class JavaClassInheritorsSearcher extends QueryExecutorBase<PsiClass, Cla
                        PsiBundle.message("psi.search.inheritors.progress"));
     }
 
-    processInheritors(consumer, baseClass, searchScope, parameters);
-
-    if (progress != null) {
-      progress.popState();
+    try {
+      processInheritors(consumer, baseClass, searchScope, parameters);
     }
+    finally {
+      if (progress != null) {
+        progress.popState();
+      }
+    }
+
   }
 
   private static void processInheritors(@NotNull final Processor<PsiClass> consumer,