1 files changed, 4 insertions, 1 deletions
diff --git a/platform/script-debugger/backend/src/org/jetbrains/rpc/MessageManager.java b/platform/script-debugger/backend/src/org/jetbrains/rpc/MessageManager.java
index 54fd4c023bd1..f7a29497e1c2 100644
--- a/platform/script-debugger/backend/src/org/jetbrains/rpc/MessageManager.java
+++ b/platform/script-debugger/backend/src/org/jetbrains/rpc/MessageManager.java
@@ -124,7 +124,10 @@ public final class MessageManager<OUTGOING, INCOMING, INCOMING_WITH_SEQ, SUCCESS
     Arrays.sort(keys);
     for (int key : keys) {
       try {
-        map.get(key).onError("Connection closed", null);
+        AsyncResultCallback<SUCCESS, ERROR_DETAILS> callback = map.get(key);
+        if (callback != null) {
+          callback.onError("Connection closed", null);
+        }
       }
       catch (Throwable e) {
         LOG.error("Failed to reject callback on connection closed", e);