diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java
index c566f537d32c..87cab00f3b7c 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManager.java
@@ -262,6 +262,8 @@ public class MavenProjectsManager extends MavenSimpleProjectComponent
   private void listenForSettingsChanges() {
     getImportingSettings().addListener(new MavenImportingSettings.Listener() {
       public void autoImportChanged() {
+        if (myProject.isDisposed()) return;
+
         if (getImportingSettings().isImportAutomatically()) {
           scheduleImportAndResolve();
         }
diff --git a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java
index 4506e0846910..1c35a719ad44 100644
--- a/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java
+++ b/plugins/maven/src/main/java/org/jetbrains/idea/maven/project/MavenProjectsManagerWatcher.java
@@ -266,6 +266,8 @@ public class MavenProjectsManagerWatcher {
     Runnable onCompletion = new Runnable() {
       @Override
       public void run() {
+        if (myProject.isDisposed()) return;
+
         if (forceImportAndResolve || myManager.getImportingSettings().isImportAutomatically()) {
           myManager.scheduleImportAndResolve();
         }