diff --git a/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java index 94db605185c9..b4510a993e79 100644 --- a/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java +++ b/java/java-impl/src/com/intellij/codeInsight/generation/OverrideImplementUtil.java @@ -114,9 +114,8 @@ public class OverrideImplementUtil extends OverrideImplementExploreUtil { return false; } if (PsiUtil.isLanguageLevel6OrHigher(targetClass)) return true; - if (targetClass.isInterface()) return true; PsiClass superClass = superMethod.getContainingClass(); - return !superClass.isInterface(); + return superClass != null && !superClass.isInterface(); } public static List overrideOrImplementMethod(PsiClass aClass,