diff --git a/builtin-annotate.c b/builtin-annotate.c
index 25ad473711..57c46840d5 100644
--- a/builtin-annotate.c
+++ b/builtin-annotate.c
@@ -4,7 +4,7 @@
  * Copyright (C) 2006 Ryan Anderson
  */
 #include "git-compat-util.h"
-#include "exec_cmd.h"
+#include "builtin.h"
 
 int cmd_annotate(int argc, const char **argv, const char *prefix)
 {
@@ -20,6 +20,6 @@ int cmd_annotate(int argc, const char **argv, const char *prefix)
 	}
 	nargv[argc + 1] = NULL;
 
-	return execv_git_cmd(nargv);
+	return cmd_blame(argc + 1, nargv, prefix);
 }
 
diff --git a/builtin-blame.c b/builtin-blame.c
index 16660221c3..066dee743e 100644
--- a/builtin-blame.c
+++ b/builtin-blame.c
@@ -1407,7 +1407,8 @@ static int read_ancestry(const char *graft_file)
 		/* The format is just "Commit Parent1 Parent2 ...\n" */
 		int len = strlen(buf);
 		struct commit_graft *graft = read_graft_line(buf, len);
-		register_commit_graft(graft, 0);
+		if (graft)
+			register_commit_graft(graft, 0);
 	}
 	fclose(fp);
 	return 0;