diff --git a/netbox/extras/registry.py b/netbox/extras/registry.py
index 47eaeb3b7..cb58f5135 100644
--- a/netbox/extras/registry.py
+++ b/netbox/extras/registry.py
@@ -7,15 +7,15 @@ class Registry(dict):
         try:
             return super().__getitem__(key)
         except KeyError:
-            raise Exception("Invalid store: {}".format(key))
+            raise KeyError("Invalid store: {}".format(key))
 
     def __setitem__(self, key, value):
         if key in self:
-            raise Exception("Store already set: {}".format(key))
+            raise KeyError("Store already set: {}".format(key))
         super().__setitem__(key, value)
 
     def __delitem__(self, key):
-        raise Exception("Cannot delete stores from registry")
+        raise TypeError("Cannot delete stores from registry")
 
 
 registry = Registry()
diff --git a/netbox/extras/tests/test_registry.py b/netbox/extras/tests/test_registry.py
index 394b7a9f3..53ba6584a 100644
--- a/netbox/extras/tests/test_registry.py
+++ b/netbox/extras/tests/test_registry.py
@@ -22,12 +22,12 @@ class RegistryTest(TestCase):
         reg = Registry()
         reg['foo'] = 123
 
-        with self.assertRaises(Exception):
+        with self.assertRaises(KeyError):
             reg['foo'] = 456
 
     def test_delete_store(self):
         reg = Registry()
         reg['foo'] = 123
 
-        with self.assertRaises(Exception):
+        with self.assertRaises(TypeError):
             del(reg['foo'])