diff --git a/source/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java b/source/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
index 78bf11812868..dbfb9c05d3e3 100644
--- a/source/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
+++ b/source/com/intellij/codeInsight/daemon/impl/analysis/HighlightMethodUtil.java
@@ -480,7 +480,7 @@ public class HighlightMethodUtil {
         if (methodCandidate2 == null) {
           registerMethodCallIntentions(highlightInfo, methodCall, list, resolveHelper);
         }
-        if (!resolveResult.isAccessible() && resolveResult.isStaticsScopeCorrect()) {
+        if (!resolveResult.isAccessible() && resolveResult.isStaticsScopeCorrect() && methodCandidate2 != null) {
           HighlightUtil.registerAccessQuickFixAction((PsiMember)element, referenceToMethod, highlightInfo);
         }
         if (!resolveResult.isStaticsScopeCorrect()) {
diff --git a/source/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/source/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index 5b9a4d759d8d..9e6b436dc188 100644
--- a/source/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/source/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -248,8 +248,7 @@ public class HighlightUtil {
 
     final PsiClass packageLocalClassInTheMiddle = getPackageLocalClassInTheMiddle(place);
     if (packageLocalClassInTheMiddle != null) {
-      QuickFixAction.registerQuickFixAction(errorResult,
-                                            new ModifierFix(packageLocalClassInTheMiddle, PsiModifier.PUBLIC, true, true));
+      QuickFixAction.registerQuickFixAction(errorResult, new ModifierFix(packageLocalClassInTheMiddle, PsiModifier.PUBLIC, true, true));
       return;
     }