diff --git a/platform/lang-impl/src/com/intellij/execution/rmi/RemoteProcessSupport.java b/platform/lang-impl/src/com/intellij/execution/rmi/RemoteProcessSupport.java
index 8bb7afc4d76b..825fd267402a 100644
--- a/platform/lang-impl/src/com/intellij/execution/rmi/RemoteProcessSupport.java
+++ b/platform/lang-impl/src/com/intellij/execution/rmi/RemoteProcessSupport.java
@@ -312,7 +312,7 @@ public abstract class RemoteProcessSupport<Target, EntryPoint, Parameters> {
     Info info;
     synchronized (myProcMap) {
       info = myProcMap.get(key);
-      if (info != null && info.handler != null && info.handler == handler) {
+      if (info != null && (handler == null || info.handler == handler)) {
         myProcMap.remove(key);
         myProcMap.notifyAll();
       }