diff --git a/mercurial/revlog.py b/mercurial/revlog.py
index a202c185ff..a631418c87 100644
--- a/mercurial/revlog.py
+++ b/mercurial/revlog.py
@@ -852,7 +852,7 @@ class revlog(object):
                 node = bin(id)
                 r = self.rev(node)
                 return node
-            except TypeError:
+            except (TypeError, LookupError):
                 pass
 
     def _partialmatch(self, id):
diff --git a/tests/test-log b/tests/test-log
index c4fc45b145..35f2ded059 100755
--- a/tests/test-log
+++ b/tests/test-log
@@ -98,4 +98,7 @@ hg log -P 2
 echo '% log -r ""'
 hg log -r ''
 
+echo '% log -r <some unknown node id>'
+hg log -r 1000000000000000000000000000000000000000
+
 exit 0
diff --git a/tests/test-log.out b/tests/test-log.out
index eb66500358..5ac0e8b9bf 100644
--- a/tests/test-log.out
+++ b/tests/test-log.out
@@ -223,3 +223,5 @@ summary:     b1
 
 % log -r ""
 abort: 00changelog.i@: ambiguous identifier!
+% log -r <some unknown node id>
+abort: unknown revision '1000000000000000000000000000000000000000'!