diff --git a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
index f7823e92a413..3bff38568d11 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/BuildManager.java
@@ -100,8 +100,7 @@ import org.jetbrains.jps.incremental.Utils;
 import org.jetbrains.jps.model.java.JpsJavaSdkType;
 import org.jetbrains.jps.model.java.compiler.JavaCompilers;
 
-import javax.tools.JavaCompiler;
-import javax.tools.ToolProvider;
+import javax.tools.*;
 import java.awt.*;
 import java.io.File;
 import java.io.IOException;
@@ -251,11 +250,11 @@ public class BuildManager implements Disposable {
       @Override
       public void after(@NotNull List<? extends VFileEvent> events) {
         if (!IS_UNIT_TEST_MODE) {
-          ApplicationManager.getApplication().executeOnPooledThread(() -> ReadAction.run(()->{
-            if (shouldTriggerMake(events)) {
-              scheduleAutoMake();
+          application.executeOnPooledThread(() -> {
+            if (!application.isDisposed()) {
+              ReadAction.run(()->{ if (shouldTriggerMake(events)) scheduleAutoMake(); });
             }
-          }));
+          });
         }
       }