diff --git a/java/compiler/impl/src/com/intellij/compiler/server/AutoMakeMessageHandler.java b/java/compiler/impl/src/com/intellij/compiler/server/AutoMakeMessageHandler.java
index 3ce88c85c348..4a792bb121e0 100644
--- a/java/compiler/impl/src/com/intellij/compiler/server/AutoMakeMessageHandler.java
+++ b/java/compiler/impl/src/com/intellij/compiler/server/AutoMakeMessageHandler.java
@@ -110,6 +110,9 @@ class AutoMakeMessageHandler extends DefaultMessageHandler {
 
   @Override
   public void handleFailure(UUID sessionId, CmdlineRemoteProto.Message.Failure failure) {
+    if (myProject.isDisposed()) {
+      return;
+    }
     String descr = failure.hasDescription() ? failure.getDescription() : null;
     if (descr == null) {
       descr = failure.hasStacktrace()? failure.getStacktrace() : "";