diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
index cb5d8fa59223..ff8316b45740 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/impl/projectlevelman/NewMappings.java
@@ -83,7 +83,9 @@ public class NewMappings {
 
     vcsManager.addInitializationRequest(VcsInitObject.MAPPINGS, new DumbAwareRunnable() {
       public void run() {
-        activateActiveVcses();
+        if (!myProject.isDisposed()) {
+          activateActiveVcses();
+        }
       }
     });
   }
diff --git a/plugins/hg4idea/src/org/zmlx/hg4idea/HgRepositoryWatcher.java b/plugins/hg4idea/src/org/zmlx/hg4idea/HgRepositoryWatcher.java
index 85fa83f1bf23..5e2568598e5b 100644
--- a/plugins/hg4idea/src/org/zmlx/hg4idea/HgRepositoryWatcher.java
+++ b/plugins/hg4idea/src/org/zmlx/hg4idea/HgRepositoryWatcher.java
@@ -15,6 +15,7 @@
  */
 package org.zmlx.hg4idea;
 
+import com.intellij.openapi.application.ApplicationManager;
 import com.intellij.openapi.components.AbstractProjectComponent;
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.util.io.FileUtil;
@@ -141,8 +142,14 @@ public class HgRepositoryWatcher extends AbstractProjectComponent implements Bul
 
   @Override
   public void directoryMappingChanged() {
-    for (VirtualFile root : myVcsManager.getRootsUnderVcs(myVcs)) {
-      registerRoot(root);
-    }
+    ApplicationManager.getApplication().runReadAction(new Runnable() {
+      @Override
+      public void run() {
+        if (myProject.isDisposed()) return;
+        for (VirtualFile root : myVcsManager.getRootsUnderVcs(myVcs)) {
+          registerRoot(root);
+        }
+      }
+    });
   }
 }