diff --git a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
index 6ee0096f0612..af5db1458218 100644
--- a/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
+++ b/java/compiler/impl/src/com/intellij/compiler/impl/CompileDriver.java
@@ -280,7 +280,9 @@ public class CompileDriver {
           }
           finally {
             result.set(COMPILE_SERVER_BUILD_STATUS.get(compileContext));
-            CompilerCacheManager.getInstance(myProject).flushCaches();
+            if (!myProject.isDisposed()) {
+              CompilerCacheManager.getInstance(myProject).flushCaches();
+            }
           }
         }
       };
diff --git a/java/java-impl/src/com/intellij/analysis/BaseClassesAnalysisAction.java b/java/java-impl/src/com/intellij/analysis/BaseClassesAnalysisAction.java
index 7d7692adb7a1..383e62d40b47 100644
--- a/java/java-impl/src/com/intellij/analysis/BaseClassesAnalysisAction.java
+++ b/java/java-impl/src/com/intellij/analysis/BaseClassesAnalysisAction.java
@@ -48,8 +48,11 @@ public abstract class BaseClassesAnalysisAction extends BaseAnalysisAction {
         indicator.setIndeterminate(true);
         indicator.setText(AnalysisScopeBundle.message("checking.class.files"));
 
-        final CompilerManager compilerManager = CompilerManager.getInstance(myProject);
-        final boolean upToDate = compilerManager.isUpToDate(compilerManager.createProjectCompileScope(myProject));
+        if (project.isDisposed()) {
+          return;
+        }
+        final CompilerManager compilerManager = CompilerManager.getInstance(project);
+        final boolean upToDate = compilerManager.isUpToDate(compilerManager.createProjectCompileScope(project));
 
         ApplicationManager.getApplication().invokeLater(new Runnable() {
           @Override
@@ -92,6 +95,9 @@ public abstract class BaseClassesAnalysisAction extends BaseAnalysisAction {
   }
 
   private void compileAndAnalyze(final Project project, final AnalysisScope scope) {
+    if (project.isDisposed()) {
+      return;
+    }
     final CompilerManager compilerManager = CompilerManager.getInstance(project);
     compilerManager.make(compilerManager.createProjectCompileScope(project), new CompileStatusNotification() {
       @Override