diff --git a/git_common.py b/git_common.py
index 1c025d111d..5cceb7bcc5 100644
--- a/git_common.py
+++ b/git_common.py
@@ -682,10 +682,14 @@ def parse_commitrefs(*commitrefs):
         * 'origin/main'
         * 'cool_branch~2'
     """
+    hashes = []
     try:
-        return [binascii.unhexlify(h) for h in hash_multi(*commitrefs)]
+        hashes = hash_multi(*commitrefs)
+        return [binascii.unhexlify(h) for h in hashes]
     except subprocess2.CalledProcessError:
         raise BadCommitRefException(commitrefs)
+    except binascii.Error as e:
+        raise binascii.Error(f'{e}. Invalid hashes are {hashes}')
 
 
 RebaseRet = collections.namedtuple('RebaseRet', 'success stdout stderr')
diff --git a/recipes/trigger_recipe_roller.txt b/recipes/trigger_recipe_roller.txt
index 0f521d1d2d..12dfaaa606 100644
--- a/recipes/trigger_recipe_roller.txt
+++ b/recipes/trigger_recipe_roller.txt
@@ -10,3 +10,4 @@ a new friend, but this information was marked RVG, so it was months before
 any details were revealed.
 
 The End!
+