From 960bd4d17b58f488f1da089e8ed4132f786567fd Mon Sep 17 00:00:00 2001
From: Konstantin Bulenkov <kb@jetbrains.com>
Date: Fri, 17 Aug 2012 18:23:06 +0400
Subject: [PATCH] IDEA-82744 Bookmarks: NPE at
 BookmarksAction$EditBookmarkDescriptionAction.actionPerformed() after
 clicking in the popup with opened description dialog

---
 .../ide/bookmarks/actions/EditBookmarkDescriptionAction.java | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java
index 6860839c8510..086ad5fc70c6 100644
--- a/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java
+++ b/platform/lang-impl/src/com/intellij/ide/bookmarks/actions/EditBookmarkDescriptionAction.java
@@ -66,7 +66,10 @@ class EditBookmarkDescriptionAction extends DumbAwareAction {
     BookmarkManager.getInstance(myProject).setDescription(b, description);
 
     myPopup.setUiVisible(true);
-    myPopup.setSize(myPopup.getContent().getPreferredSize());
+    final JComponent content = myPopup.getContent();
+    if (content != null) {
+      myPopup.setSize(content.getPreferredSize());
+    }
   }
 
   public void setPopup(JBPopup popup) {