--- a/mercurial/revlog.py	Tue Jun 20 23:39:59 2017 -0700
+++ b/mercurial/revlog.py	Tue Jun 20 22:11:46 2017 +0530
@@ -13,6 +13,7 @@
 
 from __future__ import absolute_import
 
+import binascii
 import collections
 import errno
 import hashlib
@@ -1094,7 +1095,7 @@
                 if maybewdir:
                     raise error.WdirUnsupported
                 return None
-            except TypeError:
+            except (TypeError, binascii.Error):
                 pass
 
     def lookup(self, id):