From 2cf5135670852bfe8d6fea24d4efd81565b64967 Mon Sep 17 00:00:00 2001
From: Alexey Pegov <alexey.pegov@jetbrains.com>
Date: Mon, 11 Oct 2010 14:41:19 +0400
Subject: [PATCH] EA-22405 - NPE: BrowserSettings.disposeUIResources

---
 .../platform-impl/src/com/intellij/ide/BrowserSettings.java | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/platform/platform-impl/src/com/intellij/ide/BrowserSettings.java b/platform/platform-impl/src/com/intellij/ide/BrowserSettings.java
index 958dfed9c623..5537704983f7 100644
--- a/platform/platform-impl/src/com/intellij/ide/BrowserSettings.java
+++ b/platform/platform-impl/src/com/intellij/ide/BrowserSettings.java
@@ -76,8 +76,10 @@ public class BrowserSettings implements Configurable, SearchableConfigurable {
   }
 
   public void disposeUIResources() {
-    mySettingsPanel.disposeUIResources();
-    mySettingsPanel = null;
+    if (mySettingsPanel != null) {
+      mySettingsPanel.disposeUIResources();
+      mySettingsPanel = null;
+    }
   }
 
 }