From 6eb68462801a1115173a4e3c63432ca44b4bf2a4 Mon Sep 17 00:00:00 2001
From: Anna Kozlova <anna.kozlova@jetbrains.com>
Date: Mon, 28 Dec 2015 12:58:27 +0100
Subject: [PATCH] NPE (IDEA-120967)

---
 .../intellij/ide/ui/customization/CustomizableActionsPanel.java | 2 +-
 .../com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java
index 1f8475c70da2..5b3303cc7d49 100644
--- a/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java
+++ b/platform/platform-impl/src/com/intellij/ide/ui/customization/CustomizableActionsPanel.java
@@ -493,7 +493,7 @@ public class CustomizableActionsPanel {
           setText(((QuickList)userObject).getName());
           icon = AllIcons.Actions.QuickList;
         }
-        else {
+        else if (userObject != null) {
           throw new IllegalArgumentException("unknown userObject: " + userObject);
         }
 
diff --git a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java
index 0b077e9cd560..e66c243a696c 100644
--- a/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java
+++ b/platform/platform-impl/src/com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java
@@ -453,6 +453,7 @@ public class ActionsTreeUtil {
         node.add(childNode);
       }
       else {
+        LOG.assertTrue(child != null);
         node.add(new DefaultMutableTreeNode(child));
       }
     }