diff -r 2327abace563 -r 8cef57031bbe mercurial/context.py
--- a/mercurial/context.py	Thu Sep 27 09:56:13 2018 -0700
+++ b/mercurial/context.py	Thu Sep 27 14:26:02 2018 -0700
@@ -435,7 +435,7 @@
                     return
                 except error.FilteredLookupError:
                     raise
-                except (TypeError, LookupError):
+                except LookupError:
                     pass
             else:
                 raise error.ProgrammingError(