diff --git a/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionActionWithOptions.java b/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionActionWithOptions.java
index 60070aa96b85..514e941956f9 100644
--- a/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionActionWithOptions.java
+++ b/platform/analysis-api/src/com/intellij/codeInsight/intention/IntentionActionWithOptions.java
@@ -25,7 +25,7 @@ import java.util.List;
  */
 public interface IntentionActionWithOptions extends IntentionAction {
   @NotNull @Unmodifiable
-  List<IntentionAction> getOptions();
+  List<@NotNull IntentionAction> getOptions();
 
   /**
    * If this intention is used as an inspection quick fix, control what should be displayed in the popup.
diff --git a/platform/analysis-api/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationHandlerBase.java b/platform/analysis-api/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationHandlerBase.java
index 06225af8333a..461a446177fe 100644
--- a/platform/analysis-api/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationHandlerBase.java
+++ b/platform/analysis-api/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationHandlerBase.java
@@ -3,11 +3,12 @@ package com.intellij.codeInsight.navigation.actions;
 
 import com.intellij.openapi.editor.Editor;
 import com.intellij.psi.PsiElement;
+import org.jetbrains.annotations.NotNull;
 import org.jetbrains.annotations.Nullable;
 
 public abstract class GotoDeclarationHandlerBase implements GotoDeclarationHandler {
   @Override
-  public PsiElement @Nullable [] getGotoDeclarationTargets(@Nullable PsiElement sourceElement, int offset, Editor editor) {
+  public @NotNull PsiElement @Nullable [] getGotoDeclarationTargets(@Nullable PsiElement sourceElement, int offset, Editor editor) {
     final PsiElement target = getGotoDeclarationTarget(sourceElement, editor);
     return target != null ? new PsiElement[]{target} : null;
   }
diff --git a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
index 0d888683712f..ed8c3f0b2be5 100644
--- a/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
+++ b/platform/analysis-impl/src/com/intellij/codeInsight/daemon/impl/HighlightInfo.java
@@ -962,7 +962,7 @@ public class HighlightInfo implements Segment {
       return myCanCleanup;
     }
 
-    public @NotNull Iterable<? extends IntentionAction> getOptions(@NotNull PsiElement element, @Nullable Editor editor) {
+    public @NotNull Iterable<? extends @NotNull IntentionAction> getOptions(@NotNull PsiElement element, @Nullable Editor editor) {
       if (editor != null && Boolean.FALSE.equals(editor.getUserData(IntentionManager.SHOW_INTENTION_OPTIONS_KEY))) {
         return Collections.emptyList();
       }