diff --git a/platform/lang-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java b/platform/lang-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java index 798d5e43dfd3..24f835511772 100644 --- a/platform/lang-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java +++ b/platform/lang-impl/src/com/intellij/psi/impl/source/PsiFileImpl.java @@ -624,6 +624,8 @@ public abstract class PsiFileImpl extends ElementBase implements PsiFileEx, PsiF @Nullable private StubTree derefStub() { + if (myStub == null) return null; + synchronized (myStubLock) { return myStub != null ? myStub.get() : null; }