diff --git a/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementVisitor.java b/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementVisitor.java
index 2137a0c06318..36f4a4948c7f 100644
--- a/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementVisitor.java
+++ b/java/java-impl/src/com/intellij/psi/codeStyle/arrangement/JavaArrangementVisitor.java
@@ -233,7 +233,10 @@ public class JavaArrangementVisitor extends JavaElementVisitor {
     }
     for (String modifier : PsiModifier.MODIFIERS) {
       if (modifierList.hasModifierProperty(modifier)) {
-        entry.addModifier(MODIFIERS.get(modifier));
+        ArrangementModifier arrangementModifier = MODIFIERS.get(modifier);
+        if (arrangementModifier != null) {
+          entry.addModifier(arrangementModifier);
+        }
       }
     }
     if (modifierList.hasModifierProperty(PsiModifier.PACKAGE_LOCAL)) {