diff --git a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
index 916e5889d756..a24d4e7ba93a 100644
--- a/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
+++ b/platform/lang-impl/src/com/intellij/execution/ui/RunContentManagerImpl.java
@@ -313,6 +313,7 @@ public class RunContentManagerImpl implements RunContentManager, Disposable {
               boolean alive = false;
               String toolWindowId = executor.getToolWindowId();
               ContentManager manager = myToolwindowIdToContentManagerMap.get(toolWindowId);
+              if (manager == null) return;
               for (Content content : manager.getContents()) {
                 RunContentDescriptor descriptor = getRunContentDescriptorByContent(content);
                 if (descriptor != null) {