From 2b3eef982fef86d8485c599e481b6fd0b44c5c1e Mon Sep 17 00:00:00 2001
From: Vladimir Krivosheev <vladimir.krivosheev@jetbrains.com>
Date: Fri, 13 Apr 2018 15:56:22 +0200
Subject: [PATCH] fix NPE (can be set to null once disposed)

---
 .../intellij/openapi/options/ex/SingleConfigurableEditor.java  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/platform/platform-impl/src/com/intellij/openapi/options/ex/SingleConfigurableEditor.java b/platform/platform-impl/src/com/intellij/openapi/options/ex/SingleConfigurableEditor.java
index fd09bc97792f..fd3139d6f392 100644
--- a/platform/platform-impl/src/com/intellij/openapi/options/ex/SingleConfigurableEditor.java
+++ b/platform/platform-impl/src/com/intellij/openapi/options/ex/SingleConfigurableEditor.java
@@ -247,7 +247,8 @@ public class SingleConfigurableEditor extends DialogWrapper {
 
   @Override
   public JComponent getPreferredFocusedComponent() {
-    JComponent preferred = myConfigurable.getPreferredFocusedComponent();
+    Configurable configurable = myConfigurable;
+    JComponent preferred = configurable == null ? null : configurable.getPreferredFocusedComponent();
     return preferred == null ? IdeFocusTraversalPolicy.getPreferredFocusedComponent(myCenterPanel) : preferred;
   }