From c8cd5a77702b82698cd07d29a6ae3439ceb0dec0 Mon Sep 17 00:00:00 2001
From: Roman Shevchenko <roman.shevchenko@jetbrains.com>
Date: Mon, 6 Jul 2015 20:17:37 +0300
Subject: [PATCH] ui: NPE in UnscrambleDialog.getPreferredFocusedComponent()

---
 .../src/com/intellij/unscramble/UnscrambleDialog.java          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java b/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java
index 682d5824e008..3773b8d5f5f1 100644
--- a/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java
+++ b/java/java-impl/src/com/intellij/unscramble/UnscrambleDialog.java
@@ -208,7 +208,8 @@ public class UnscrambleDialog extends DialogWrapper {
   }
 
   public JComponent getPreferredFocusedComponent() {
-    return getRootPane().getDefaultButton();
+    JRootPane pane = getRootPane();
+    return pane != null ? pane.getDefaultButton() : super.getPreferredFocusedComponent();
   }
 
   private void createLogFileChooser() {