diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
index 1e36033ea025..b14008aa291e 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/changes/ChangeListManagerImpl.java
@@ -457,7 +457,7 @@ public class ChangeListManagerImpl extends ChangeListManagerEx implements Projec
 
       for (VcsDirtyScope scope : scopes) {
         AbstractVcs vcs = scope.getVcs();
-        if (vcs.isTrackingUnchangedContent()) {
+        if (vcs != null && vcs.isTrackingUnchangedContent()) {
           scope.iterateExistingInsideScope(new Processor<VirtualFile>() {
             @Override
             public boolean process(VirtualFile file) {