diff --git a/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java b/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java
index 577d96bb4f0e..a9446399ccf3 100644
--- a/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java
+++ b/platform/lang-impl/src/com/intellij/application/options/InitialConfigurationDialog.java
@@ -105,7 +105,9 @@ public class InitialConfigurationDialog extends DialogWrapper {
     myColorSchemeComboBox.setRenderer(new ListCellRendererWrapper(myColorSchemeComboBox.getRenderer()) {
       @Override
       public void customize(JList list, Object value, int index, boolean selected, boolean cellHasFocus) {
-        setText(((EditorColorsScheme)value).getName());
+        if (value != null) {
+          setText(((EditorColorsScheme)value).getName());
+        }
       }
     });
     myColorSchemeComboBox.addActionListener(new ActionListener() {