EA-21315

diff --git a/java/java-impl/src/com/intellij/psi/NonClasspathClassFinder.java b/java/java-impl/src/com/intellij/psi/NonClasspathClassFinder.java
index 70574ed584f91abf22cd333b4072b8d95aef5b4e..cf2d48e0e084a4c3c83a0cc124633afc1e87aa5d 100644 (file)
--- a/java/java-impl/src/com/intellij/psi/NonClasspathClassFinder.java
+++ b/java/java-impl/src/com/intellij/psi/NonClasspathClassFinder.java
@@ -27,6 +27,7 @@ import com.intellij.psi.search.NonClasspathDirectoryScope;
 import com.intellij.util.Processor;
 import com.intellij.util.containers.ContainerUtil;
 import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
 
 import java.util.*;
 
@@ -158,12 +159,12 @@ public abstract class NonClasspathClassFinder extends PsiElementFinder {
         final VirtualFile dir = classRoot.findFileByRelativePath(qname.replace('.', '/'));
         if (dir != null && dir.isDirectory()) {
           final PsiDirectory psiDirectory = ApplicationManager.getApplication().runReadAction(new Computable<PsiDirectory>() {
+            @Nullable
             public PsiDirectory compute() {
-              return psiManager.findDirectory(dir);
+              return dir.isValid() ? psiManager.findDirectory(dir) : null;
             }
           });
-          assert psiDirectory != null;
-          if (!consumer.process(psiDirectory)) {
+          if (psiDirectory != null && !consumer.process(psiDirectory)) {
             return false;
           }
         }