diff --git a/platform/core-api/src/com/intellij/psi/stubs/PsiFileStubImpl.java b/platform/core-api/src/com/intellij/psi/stubs/PsiFileStubImpl.java
index 60ba5f21a0d2..a8bf86a79722 100644
--- a/platform/core-api/src/com/intellij/psi/stubs/PsiFileStubImpl.java
+++ b/platform/core-api/src/com/intellij/psi/stubs/PsiFileStubImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2000-2009 JetBrains s.r.o.
+ * Copyright 2000-2015 JetBrains s.r.o.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -70,7 +70,8 @@ public class PsiFileStubImpl<T extends PsiFile> extends StubBase<T> implements P
   @NotNull
   @Override
   public PsiFileStub[] getStubRoots() {
-    return myStubRoots != null ? myStubRoots : new PsiFileStub[]{this};
+    PsiFileStub[] roots = myStubRoots;
+    return roots == null ? new PsiFileStub[]{this} : roots;
   }
 
   public void setStubRoots(@NotNull PsiFileStub[] roots) {