diff --git a/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java b/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
index 66288e3c2cb0..1b2589f7a714 100644
--- a/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
+++ b/platform/core-impl/src/com/intellij/psi/impl/file/impl/FileManagerImpl.java
@@ -465,7 +465,9 @@ public class FileManagerImpl implements FileManager {
           }
           else {
             FileViewProvider viewProvider = myVFileToViewProviderMap.remove(file);
-            markInvalidated(viewProvider);
+            if (viewProvider != null) {
+              markInvalidated(viewProvider);
+            }
           }
           return true;
         }
@@ -476,7 +478,7 @@ public class FileManagerImpl implements FileManager {
     }
   }
 
-  private void markInvalidated(FileViewProvider viewProvider) {
+  private void markInvalidated(@NotNull FileViewProvider viewProvider) {
     if (viewProvider instanceof SingleRootFileViewProvider) {
       ((SingleRootFileViewProvider)viewProvider).markInvalidated();
     }