diff --git a/platform/platform-impl/src/com/intellij/openapi/vcs/impl/FileStatusManagerImpl.java b/platform/platform-impl/src/com/intellij/openapi/vcs/impl/FileStatusManagerImpl.java
index 0142f8fd61a4..f8bd9fab1dea 100644
--- a/platform/platform-impl/src/com/intellij/openapi/vcs/impl/FileStatusManagerImpl.java
+++ b/platform/platform-impl/src/com/intellij/openapi/vcs/impl/FileStatusManagerImpl.java
@@ -138,7 +138,9 @@ public class FileStatusManagerImpl extends FileStatusManager implements ProjectC
   public void initComponent() { }
 
   public void addFileStatusListener(@NotNull FileStatusListener listener) {
-    myListeners.add(listener);
+    if (listener != null) {
+      myListeners.add(listener);
+    }
   }
 
   public void addFileStatusListener(final FileStatusListener listener, Disposable parentDisposable) {