From 9c3260d17bd0f7d46af5980c0588170b2ffc5e60 Mon Sep 17 00:00:00 2001
From: Eugene Zhuravlev <jeka@intellij.com>
Date: Mon, 10 Feb 2014 11:48:12 +0400
Subject: [PATCH] fix NPE

---
 .../src/com/intellij/ui/popup/AbstractPopup.java       | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
index 0c2d7bec1c1a..be934bd5fa4f 100644
--- a/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
+++ b/platform/platform-impl/src/com/intellij/ui/popup/AbstractPopup.java
@@ -1650,8 +1650,14 @@ public class AbstractPopup implements JBPopup {
     if (size == null) {
       myMinSize =  myHeaderPanel.getPreferredSize();
     } else {
-      myMinSize.setSize(Math.min(size.width, myHeaderPanel.getPreferredSize().width),
-                                 Math.min(size.height, myHeaderPanel.getPreferredSize().height));
+      final int width = Math.min(size.width, myHeaderPanel.getPreferredSize().width);
+      final int height = Math.min(size.height, myHeaderPanel.getPreferredSize().height);
+      if (myMinSize == null) {
+        myMinSize = new Dimension(width, height);
+      }
+      else {
+        myMinSize.setSize(width, height);
+      }
     }
 
     if (myWindow != null) {