From e8384f87468bc4de0f57df63315988b02877de58 Mon Sep 17 00:00:00 2001
From: "Vladislav.Soroka" <Vladislav.Soroka@jetbrains.com>
Date: Thu, 16 Feb 2017 16:57:53 +0300
Subject: [PATCH] external system auto-import rework; npe fix

---
 .../service/project/manage/ExternalProjectsManager.java       | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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;
   }