From 1afddbc6517f475e1380c11ec88b500f1dfe66d1 Mon Sep 17 00:00:00 2001
From: Rustam Vishnyakov <rustam.vishnyakov@jetbrains.com>
Date: Mon, 19 Dec 2016 20:13:33 +0300
Subject: [PATCH] NPE fix for TraverseUITest

---
 .../com/intellij/application/options/colors/SchemesPanel.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/platform/lang-impl/src/com/intellij/application/options/colors/SchemesPanel.java b/platform/lang-impl/src/com/intellij/application/options/colors/SchemesPanel.java
index 60b2676704f9..b4fc82e32033 100644
--- a/platform/lang-impl/src/com/intellij/application/options/colors/SchemesPanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/colors/SchemesPanel.java
@@ -130,7 +130,7 @@ public class SchemesPanel extends AbstractSchemesPanel<EditorColorsScheme> imple
       @Nullable
       @Override
       protected EditorColorsScheme getCurrentScheme() {
-        return myOptions.getScheme(getSelectedSchemeName());
+        return myOptions != null ? myOptions.getScheme(getSelectedSchemeName()) : null;
       }
     };
   }