diff --git a/platform/lang-impl/src/com/intellij/codeInsight/actions/BaseCodeInsightAction.java b/platform/lang-impl/src/com/intellij/codeInsight/actions/BaseCodeInsightAction.java
index 4dc3c699027e..61cce0c6e293 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/actions/BaseCodeInsightAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/actions/BaseCodeInsightAction.java
@@ -21,7 +21,6 @@ import com.intellij.codeInsight.lookup.LookupManager;
 import com.intellij.openapi.actionSystem.AnActionEvent;
 import com.intellij.openapi.actionSystem.CommonDataKeys;
 import com.intellij.openapi.actionSystem.DataContext;
-import com.intellij.openapi.actionSystem.PlatformDataKeys;
 import com.intellij.openapi.actionSystem.Presentation;
 import com.intellij.openapi.editor.Editor;
 import com.intellij.openapi.project.Project;
@@ -68,7 +67,7 @@ public abstract class BaseCodeInsightAction extends CodeInsightAction {
   }
 
   @Nullable
-  protected Editor getBaseEditor(final DataContext dataContext, final Project project) {
+  protected Editor getBaseEditor(@NotNull final DataContext dataContext, @NotNull final Project project) {
     return super.getEditor(dataContext, project);
   }
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowContainerInfoAction.java b/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowContainerInfoAction.java
index 1cb27b29ad58..52c027975fed 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowContainerInfoAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/hint/actions/ShowContainerInfoAction.java
@@ -37,7 +37,7 @@ public class ShowContainerInfoAction extends BaseCodeInsightAction{
 
   @Override
   @Nullable
-  protected Editor getBaseEditor(final DataContext dataContext, final Project project) {
+  protected Editor getBaseEditor(@NotNull final DataContext dataContext, @NotNull final Project project) {
     return CommonDataKeys.EDITOR_EVEN_IF_INACTIVE.getData(dataContext);
   }
 
diff --git a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java
index 1aa926aa31f9..dd42b6c06a69 100644
--- a/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java
+++ b/platform/lang-impl/src/com/intellij/codeInsight/navigation/actions/GotoDeclarationAction.java
@@ -271,7 +271,13 @@ public class GotoDeclarationAction extends BaseCodeInsightAction implements Code
       if (component != null) {
         Point point = ((MouseEvent)inputEvent).getPoint();
         Component componentAt = SwingUtilities.getDeepestComponentAt(component, point.x, point.y);
-        Editor editor = getBaseEditor(event.getDataContext(), event.getProject());
+        Project project = event.getProject();
+        if (project == null) {
+          event.getPresentation().setEnabled(false);
+          return;
+        }
+
+        Editor editor = getBaseEditor(event.getDataContext(), project);
         if (componentAt instanceof EditorGutterComponentEx) {
           event.getPresentation().setEnabled(false);
           return;