diff --git a/platform/vcs-api/src/com/intellij/openapi/vcs/actions/VcsContext.java b/platform/vcs-api/src/com/intellij/openapi/vcs/actions/VcsContext.java
index fc624976ce9f..dc0d420d92fc 100644
--- a/platform/vcs-api/src/com/intellij/openapi/vcs/actions/VcsContext.java
+++ b/platform/vcs-api/src/com/intellij/openapi/vcs/actions/VcsContext.java
@@ -30,7 +30,7 @@ import java.io.File;
 import java.util.Collection;
 
 public interface VcsContext extends PlaceProvider<String> {
-  Project getProject();
+  @Nullable Project getProject();
 
   @Nullable
   VirtualFile getSelectedFile();
diff --git a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java
index a31a3ae759c0..3008138c60a2 100644
--- a/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java
+++ b/platform/vcs-impl/src/com/intellij/openapi/vcs/actions/AnnotateToggleAction.java
@@ -111,8 +111,11 @@ public class AnnotateToggleAction extends ToggleAction implements DumbAware, Ann
     if (selectedFile == null) {
       return false;
     }
+
+    Project project = context.getProject();
+    if (project == null) return false;
     
-    for (FileEditor fileEditor : FileEditorManager.getInstance(context.getProject()).getEditors(selectedFile)) {
+    for (FileEditor fileEditor : FileEditorManager.getInstance(project).getEditors(selectedFile)) {
       if (fileEditor instanceof TextEditor) {
         if (isAnnotated(((TextEditor)fileEditor).getEditor())) {
           return true;