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 imple @Nullable @Override protected EditorColorsScheme getCurrentScheme() { - return myOptions.getScheme(getSelectedSchemeName()); + return myOptions != null ? myOptions.getScheme(getSelectedSchemeName()) : null; } }; }