From e5000a7103cf00efc604675e92e5d5d3e8a5544f Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Mon, 31 Oct 2016 15:55:25 +0100
Subject: [PATCH] IDEA-163371 IntelliJ project view stops working: "null keys
 not supported

(cherry picked from commit b35672d5b7a0275618432c5a8e31a65bd3e17f4d)
---
 .../ide/projectView/impl/ProjectViewImpl.java        | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
index 8b37120fcade..ca3daa2dd274 100644
--- a/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
+++ b/platform/lang-impl/src/com/intellij/ide/projectView/impl/ProjectViewImpl.java
@@ -1534,11 +1534,13 @@ public class ProjectViewImpl extends ProjectView implements PersistentStateCompo
 
   @NotNull
   private ActionCallback setPaneOption(@NotNull Map<String, Boolean> optionsMap, boolean value, String paneId, final boolean updatePane) {
-    optionsMap.put(paneId, value);
-    if (updatePane) {
-      final AbstractProjectViewPane pane = getProjectViewPaneById(paneId);
-      if (pane != null) {
-        return pane.updateFromRoot(false);
+    if (paneId != null) {
+      optionsMap.put(paneId, value);
+      if (updatePane) {
+        final AbstractProjectViewPane pane = getProjectViewPaneById(paneId);
+        if (pane != null) {
+          return pane.updateFromRoot(false);
+        }
       }
     }
     return ActionCallback.DONE;