From 57d1d530c79feffc29f1df14b07564a699885af5 Mon Sep 17 00:00:00 2001
From: "Gregory.Shrago" <gregory.shrago@jetbrains.com>
Date: Tue, 1 Mar 2016 18:39:12 +0300
Subject: [PATCH] EA-79040 - IAE: LRUPopupBuilder$.getIconFor

---
 .../src/com/intellij/ide/scratch/LRUPopupBuilder.java     | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/scratch/LRUPopupBuilder.java b/platform/lang-impl/src/com/intellij/ide/scratch/LRUPopupBuilder.java
index 2676a3f9a1f4..77601cc4b877 100644
--- a/platform/lang-impl/src/com/intellij/ide/scratch/LRUPopupBuilder.java
+++ b/platform/lang-impl/src/com/intellij/ide/scratch/LRUPopupBuilder.java
@@ -169,13 +169,13 @@ public abstract class LRUPopupBuilder<T> {
       new BaseListPopupStep<T>(myTitle, combinedItems) {
         @NotNull
         @Override
-        public String getTextFor(@NotNull T t) {
-          return getPresentation(t).first;
+        public String getTextFor(T t) {
+          return t == null ? "" : getPresentation(t).first;
         }
 
         @Override
-        public Icon getIconFor(@NotNull T t) {
-          return getPresentation(t).second;
+        public Icon getIconFor(T t) {
+          return t == null ? null : getPresentation(t).second;
         }
 
         @Override