diff --git a/java/java-impl/src/com/siyeh/ig/jdk/ForwardCompatibilityInspection.java b/java/java-impl/src/com/siyeh/ig/jdk/ForwardCompatibilityInspection.java
index 5da67c52486b..623520233f5c 100644
--- a/java/java-impl/src/com/siyeh/ig/jdk/ForwardCompatibilityInspection.java
+++ b/java/java-impl/src/com/siyeh/ig/jdk/ForwardCompatibilityInspection.java
@@ -75,8 +75,12 @@ public final class ForwardCompatibilityInspection extends AbstractBaseJavaLocalI
         if (nameElement != null && PsiKeyword.YIELD.equals(nameElement.getText()) && ref.getQualifierExpression() == null &&
             !JavaFeature.SWITCH_EXPRESSION.isSufficient(languageLevel)) {
           PsiExpression qualifier = ExpressionUtils.getEffectiveQualifier(expression.getMethodExpression());
-          holder.registerProblem(nameElement, JavaErrorBundle.message("yield.unqualified.method.warn"),
-                                   qualifier == null ? null : new QualifyCallFix(), new RenameFix());
+          String message = JavaErrorBundle.message("yield.unqualified.method.warn");
+          if (qualifier != null) {
+            holder.registerProblem(nameElement, message, new QualifyCallFix(), new RenameFix());
+          } else {
+            holder.registerProblem(nameElement, message, new RenameFix());
+          }
         }
       }