From e5616fc5b7e60306bd843e663a2fb57fedbe4311 Mon Sep 17 00:00:00 2001
From: Vassiliy Kudryashov <Vassiliy.Kudryashov@jetbrains.com>
Date: Fri, 3 Aug 2012 15:56:33 +0400
Subject: [PATCH] Fix for NPE (EA-37892)

---
 .../com/intellij/openapi/actionSystem/ex/ComboBoxAction.java   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
index 142957886db8..df0e1d949026 100644
--- a/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
+++ b/platform/platform-api/src/com/intellij/openapi/actionSystem/ex/ComboBoxAction.java
@@ -188,7 +188,8 @@ public abstract class ComboBoxAction extends AnAction implements CustomComponent
         if (rectangle.contains(eventPoint)) {
           MouseEvent event = SwingUtilities.convertMouseEvent(e.getComponent(), e, myPopup.getContent());
           Component component = SwingUtilities.getDeepestComponentAt(content, event.getX(), event.getY());
-          component.dispatchEvent(event);
+          if (component != null)
+            component.dispatchEvent(event);
         }
       }
     }