diff --git a/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java b/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java
index 28e62c06c0e4..c2ef19131a90 100644
--- a/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java
+++ b/platform/core-impl/src/com/intellij/psi/SingleRootFileViewProvider.java
@@ -178,7 +178,7 @@ public class SingleRootFileViewProvider extends UserDataHolderBase implements Fi
         psiFile = PsiUtilCore.NULL_PSI_FILE;
       }
       boolean set = myPsiFile.compareAndSet(null, psiFile);
-      if (!set) {
+      if (!set && psiFile != PsiUtilCore.NULL_PSI_FILE) {
         PsiFile alreadyCreated = myPsiFile.get();
         if (alreadyCreated == psiFile) {
           LOG.error(this + ".createFile() must create new file instance but got the same: " + psiFile);