Merged refactoring changes with upstream

1 files changed, 3 insertions, 4 deletions

diff --git a/opendc/models/model.py b/opendc/models/model.py
index d0bf34ee..2505ae61 100644
--- a/opendc/models/model.py
+++ b/opendc/models/model.py
@@ -1,4 +1,5 @@
 from opendc.util.database import DB
+from opendc.util.exceptions import ClientError
 from opendc.util.rest import Response
 
 
@@ -12,11 +13,9 @@ class Model:
     def __init__(self, obj):
         self.obj = obj
 
-    def validate(self, request_google_id=None):
+    def check_exists(self):
         if self.obj is None:
-            return Response(404, 'Not found.')
-
-        return None
+            raise ClientError(Response(404, 'Not found.'))
 
     def set_property(self, key, value):
         self.obj[key] = value