diff --git a/platform/lang-impl/src/com/intellij/openapi/vcs/impl/ModuleDefaultVcsRootPolicy.java b/platform/lang-impl/src/com/intellij/openapi/vcs/impl/ModuleDefaultVcsRootPolicy.java
index e16e9459dde1..da665f49b177 100644
--- a/platform/lang-impl/src/com/intellij/openapi/vcs/impl/ModuleDefaultVcsRootPolicy.java
+++ b/platform/lang-impl/src/com/intellij/openapi/vcs/impl/ModuleDefaultVcsRootPolicy.java
@@ -64,8 +64,11 @@ public class ModuleDefaultVcsRootPolicy extends DefaultVcsRootPolicy {
     final StorageScheme storageScheme = ((ProjectEx) myProject).getStateStore().getStorageScheme();
     if (StorageScheme.DIRECTORY_BASED.equals(storageScheme) && (myBaseDir != null)) {
       final VirtualFile ideaDir = myBaseDir.findChild(Project.DIRECTORY_STORE_FOLDER);
-      if (ideaDir != null && ideaDir.isValid() && ideaDir.isDirectory() && vcsName.equals(vcsManager.getVcsFor(ideaDir))) {
-        result.add(ideaDir);
+      if (ideaDir != null && ideaDir.isValid() && ideaDir.isDirectory()) {
+        final AbstractVcs vcsFor = vcsManager.getVcsFor(ideaDir);
+        if (vcsFor != null && vcsName.equals(vcsFor.getName())) {
+          result.add(ideaDir);
+        }
       }
     }
     // assertion for read access inside