diff --git a/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java b/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java
index 7d71ea12375e..c2c5070a7e2f 100644
--- a/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java
+++ b/platform/lang-impl/src/com/intellij/application/options/GeneralCodeStylePanel.java
@@ -218,8 +218,12 @@ public class GeneralCodeStylePanel extends CodeStyleAbstractPanel {
 
       for(Map.Entry<FileType, IndentOptionsEditor> entry : myAdditionalIndentOptions.entrySet()) {
         FileType fileType = entry.getKey();
+        CodeStyleSettings.IndentOptions additionalIndentOptions = settings.getAdditionalIndentOptions(fileType);
+        if (additionalIndentOptions == null) {
+          continue;
+        }
         IndentOptionsEditor editor = entry.getValue();
-        editor.apply(settings, settings.getAdditionalIndentOptions(fileType));
+        editor.apply(settings, additionalIndentOptions);
       }
     }