From df4a4ff122f9614f9e97d254f4c8e326d5d4d5f2 Mon Sep 17 00:00:00 2001
From: anna <anna.kozlova@jetbrains.com>
Date: Tue, 22 Dec 2009 21:32:00 +0300
Subject: [PATCH] NPE

---
 .../com/intellij/openapi/keymap/impl/ui/ActionsTreeUtil.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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 f72bb3b24860..313a4313bc5b 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
@@ -172,7 +172,7 @@ public class ActionsTreeUtil {
       else if (action instanceof Separator) {
         group.addSeparator();
       }
-      else {
+      else if (action != null) {
         String id = action instanceof ActionStub ? ((ActionStub)action).getId() : actionManager.getId(action);
         if (id != null) {
           if (id.startsWith(TOOL_ACTION_PREFIX)) continue;