diff --git a/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java b/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
index 213a96055527..46875b9d8c23 100644
--- a/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
+++ b/plugins/git4idea/src/git4idea/annotate/GitAnnotationProvider.java
@@ -126,6 +126,7 @@ public class GitAnnotationProvider implements AnnotationProvider, VcsCacheableAn
       command.run();
     }
     if (exception[0] != null) {
+      LOG.warn(exception[0]);
       throw new VcsException("Failed to annotate: " + exception[0], exception[0]);
     }
     return annotation[0];
@@ -172,7 +173,8 @@ public class GitAnnotationProvider implements AnnotationProvider, VcsCacheableAn
         commitHash = null;
       }
       s.spaceToken(); // skip revision line number
-      int lineNum = Integer.parseInt(s.spaceToken());
+      String s1 = s.spaceToken();
+      int lineNum = Integer.parseInt(s1);
       s.nextLine();
       // parse commit information
       CommitInfo commit = commits.get(commitHash);