diff --git a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
index 66db312436e3..7c883dc0207a 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java
@@ -387,7 +387,8 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF
   }
 
   private void clearStub() {
-    StubTree stubHolder = myStub == null ? null : myStub.get();
+    SoftReference<StubTree> stubRef = myStub;
+    StubTree stubHolder = stubRef == null ? null : stubRef.get();
     if (stubHolder != null) {
       ((StubBase<?>)stubHolder.getRoot()).setPsi(null);
     }