diff --git a/platform/lang-impl/src/com/intellij/facet/impl/ui/FacetDependentToolWindowManager.java b/platform/lang-impl/src/com/intellij/facet/impl/ui/FacetDependentToolWindowManager.java
index bd5471b35fb5..e0ba102b438d 100644
--- a/platform/lang-impl/src/com/intellij/facet/impl/ui/FacetDependentToolWindowManager.java
+++ b/platform/lang-impl/src/com/intellij/facet/impl/ui/FacetDependentToolWindowManager.java
@@ -47,7 +47,7 @@ final class FacetDependentToolWindowManager implements ProjectComponent {
                 return;
               }
             }
-            toolWindowManager.unregisterToolWindow(extension.id);
+            toolWindow.remove();
           }
         }
       }
diff --git a/platform/platform-impl/src/com/intellij/openapi/wm/impl/LibraryDependentToolWindowManager.java b/platform/platform-impl/src/com/intellij/openapi/wm/impl/LibraryDependentToolWindowManager.java
index cc712fc61763..51a2d138d3a7 100644
--- a/platform/platform-impl/src/com/intellij/openapi/wm/impl/LibraryDependentToolWindowManager.java
+++ b/platform/platform-impl/src/com/intellij/openapi/wm/impl/LibraryDependentToolWindowManager.java
@@ -13,6 +13,7 @@ import com.intellij.openapi.startup.StartupActivity;
 import com.intellij.openapi.wm.ToolWindow;
 import com.intellij.openapi.wm.ex.ToolWindowManagerEx;
 import com.intellij.openapi.wm.ext.LibraryDependentToolWindow;
+import com.intellij.openapi.wm.ext.LibrarySearchHelper;
 import com.intellij.util.concurrency.SequentialTaskExecutor;
 import com.intellij.util.containers.ContainerUtil;
 import com.intellij.util.messages.MessageBusConnection;
@@ -54,7 +55,10 @@ public class LibraryDependentToolWindowManager implements StartupActivity {
     List<LibraryDependentToolWindow> extensions = LibraryDependentToolWindow.EXTENSION_POINT_NAME.getExtensionList();
 
     ReadAction
-      .nonBlocking(() -> new HashSet<>(ContainerUtil.findAll(extensions, ltw -> ltw.getLibrarySearchHelper().isLibraryExists(project))))
+      .nonBlocking(() -> new HashSet<>(ContainerUtil.findAll(extensions, ltw -> {
+        LibrarySearchHelper helper = ltw.getLibrarySearchHelper();
+        return helper != null && helper.isLibraryExists(project);
+      })))
       .inSmartMode(project)
       .coalesceBy(this)
       .finishOnUiThread(currentModalityState, existing -> {
@@ -68,12 +72,11 @@ public class LibraryDependentToolWindowManager implements StartupActivity {
           }
           else {
             if (toolWindow != null) {
-              toolWindowManagerEx.unregisterToolWindow(libraryToolWindow.id);
+              toolWindow.remove();
             }
           }
         }
       })
       .submit(ourExecutor);
   }
-
 }