diff --git a/src/libgit2/blame.c b/src/libgit2/blame.c
index 4f99de69b..e31b9d547 100644
--- a/src/libgit2/blame.c
+++ b/src/libgit2/blame.c
@@ -461,6 +461,12 @@ static int blame_internal(git_blame *blame)
 
 	for (ent = blame->ent; ent; ent = ent->next) {
 		git_blame_hunk *h = hunk_from_entry(ent, blame);
+
+		if (!h) {
+			error = -1;
+			goto on_error;
+		}
+
 		git_vector_insert(&blame->hunks, h);
 	}