From 44564a455fdfbeee031c566cf0d1be0576c67abd Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Thu, 23 Mar 2017 15:27:27 +0300
Subject: [PATCH] EA-99425 - NPE: ComboboxSpeedSearch.getElementText

---
 .../platform-impl/src/com/intellij/ui/ComboboxSpeedSearch.java  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/ComboboxSpeedSearch.java b/platform/platform-impl/src/com/intellij/ui/ComboboxSpeedSearch.java
index 83ce37170579..114f2f0e90aa 100644
--- a/platform/platform-impl/src/com/intellij/ui/ComboboxSpeedSearch.java
+++ b/platform/platform-impl/src/com/intellij/ui/ComboboxSpeedSearch.java
@@ -56,6 +56,6 @@ public class ComboboxSpeedSearch extends SpeedSearchBase<JComboBox> {
   }
 
   protected String getElementText(Object element) {
-    return element.toString();
+    return element == null ? null : element.toString();
   }
 }
\ No newline at end of file