diff --git a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalProjectsManager.java b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalProjectsManager.java
index c68e02f52bbc..b90f10c5e182 100644
--- a/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalProjectsManager.java
+++ b/platform/external-system-impl/src/com/intellij/openapi/externalSystem/service/project/manage/ExternalProjectsManager.java
@@ -244,7 +244,9 @@ public class ExternalProjectsManager implements PersistentStateComponent<Externa
   public void dispose() {
     myProjectsViews.clear();
     myRunManagerListener.detach();
-    myWatcher.stop();
+    if(myWatcher != null) {
+      myWatcher.stop();
+    }
     myWatcher = null;
   }