diff --git a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
index 5c99f0ceb236..9dfe06c43797 100644
--- a/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
+++ b/java/java-analysis-impl/src/com/intellij/codeInsight/daemon/impl/analysis/HighlightUtil.java
@@ -299,7 +299,11 @@ public final class HighlightUtil {
     if (highlightInfo == null) {
       return fix -> {};
     }
-    return fix -> highlightInfo.registerFix(fix.asIntention(), null, null, null, null);
+    return fix -> {
+      if (fix != null) {
+        highlightInfo.registerFix(fix.asIntention(), null, null, null, null);
+      }
+    };
   }
 
   static void registerReturnTypeFixes(@NotNull HighlightInfo.Builder info, @NotNull PsiMethod method, @NotNull PsiType expectedReturnType) {