diff --git a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityModifierFix.java b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityModifierFix.java
index 897a173353b..814f9687b09 100644
--- a/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityModifierFix.java
+++ b/idea/src/org/jetbrains/kotlin/idea/quickfix/ChangeVisibilityModifierFix.java
@@ -102,6 +102,11 @@ public class ChangeVisibilityModifierFix extends JetIntentionAction<JetModifierL
         if (maxVisibility == memberDescriptor.getVisibility()) {
             return null;
         }
+
+        if (maxVisibility == null) {
+            return null;
+        }
+
         return JetRefactoringUtil.getVisibilityToken(maxVisibility);
     }