1 files changed, 2 insertions, 1 deletions
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 3008138c60a2..291289854fa7 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
@@ -169,6 +169,7 @@ public class AnnotateToggleAction extends ToggleAction implements DumbAware, Ann
     if (vcs == null) return;
 
     final AnnotationProvider annotationProvider = vcs.getCachingAnnotationProvider();
+    assert annotationProvider != null;
 
     final Ref<FileAnnotation> fileAnnotationRef = new Ref<FileAnnotation>();
     final Ref<VcsException> exceptionRef = new Ref<VcsException>();
@@ -190,7 +191,7 @@ public class AnnotateToggleAction extends ToggleAction implements DumbAware, Ann
           exceptionRef.set(e);
         }
         catch (Throwable t) {
-          handler.completed(file.getPath());
+          exceptionRef.set(new VcsException(t));
         }
       }