diff --git a/package.json b/package.json
index 19a0ebd..6ef2fac 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "url": "https://github.com/notatestuser/gift.git"
   },
   "dependencies": {
+    "sha1-regex": "^1.0.0",
     "underscore": "1.x.x"
   },
   "devDependencies": {
diff --git a/src/commit.coffee b/src/commit.coffee
index 22c087a..4ddfc00 100644
--- a/src/commit.coffee
+++ b/src/commit.coffee
@@ -1,6 +1,7 @@
 _     = require 'underscore'
 Actor = require './actor'
 Tree  = require './tree'
+sha1  = require 'sha1-regex'
 
 module.exports = class Commit
   constructor: (@repo, @id, parents, tree, @author, @authored_date, @committer, @committed_date, @gpgsig, @message) ->
@@ -83,7 +84,7 @@ module.exports = class Commit
     lines   = text.split "\n"
     while lines.length
       id   = _.last lines.shift().split(" ")
-      break if !id
+      break if !sha1.test(id)
       tree = _.last lines.shift().split(" ")
 
       parents = []