diff --git a/r2/r2/lib/db/thing.py b/r2/r2/lib/db/thing.py
index 17ca7b9f1..86d749a32 100644
--- a/r2/r2/lib/db/thing.py
+++ b/r2/r2/lib/db/thing.py
@@ -485,7 +485,7 @@ class DataThing(object):
                 thing_id = int(thing_id, 36)
                 lookup[fullname] = (real_type, thing_id)
                 table.setdefault(real_type, []).append(thing_id)
-            except ValueError:
+            except (KeyError, ValueError):
                 if single:
                     raise NotFound