diff --git a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
index 8335eee4c50b..262a4bb7c14c 100644
--- a/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
+++ b/java/java-psi-api/src/com/intellij/psi/util/PsiUtil.java
@@ -1039,7 +1039,10 @@ public final class PsiUtil extends PsiUtilCore {
       }
       if (type instanceof PsiClassType) {
         try {
-          ((PsiClassType)type).resolve(); // should throw exception
+          PsiClass psiClass = ((PsiClassType)type).resolve(); // should throw exception
+          if (psiClass != null) {
+            ensureValid(psiClass);
+          }
         }
         catch (PsiInvalidElementAccessException e) {
           throw customMessage == null? e : new RuntimeException(customMessage, e);