diff --git a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
index 86f914059cd1..aca6e3b7fd22 100644
--- a/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
+++ b/platform/lang-impl/src/com/intellij/ide/util/gotoByName/ChooseByNameBase.java
@@ -1442,7 +1442,10 @@ public abstract class ChooseByNameBase {
     @Override
     public void onCanceled(@NotNull ProgressIndicator indicator) {
       LOG.assertTrue(myCalcElementsThread == this, myCalcElementsThread);
-      new CalcElementsThread(myPattern, myCheckboxState, myCallback, myModalityState).scheduleThread();
+
+      if (!myProject.isDisposed()) {
+        new CalcElementsThread(myPattern, myCheckboxState, myCallback, myModalityState).scheduleThread();
+      }
     }
 
     private void addElementsByPattern(@NotNull String pattern,
diff --git a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcProjectWithoutLibraryNotificator.java b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcProjectWithoutLibraryNotificator.java
index 2f8eaf1397b0..16f57d0084f4 100644
--- a/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcProjectWithoutLibraryNotificator.java
+++ b/plugins/groovy/src/org/jetbrains/plugins/groovy/mvc/MvcProjectWithoutLibraryNotificator.java
@@ -85,7 +85,9 @@ public class MvcProjectWithoutLibraryNotificator implements StartupActivity, Dum
 
       @Override
       public void onCanceled(@NotNull ProgressIndicator indicator) {
-        ProgressIndicatorUtils.scheduleWithWriteActionPriority(this);
+        if (!project.isDisposed()) {
+          ProgressIndicatorUtils.scheduleWithWriteActionPriority(this);
+        }
       }
     });
   }