1 files changed, 12 insertions, 10 deletions
diff --git a/megapixels/app/models/sql_factory.py b/megapixels/app/models/sql_factory.py
index a71eabb0..5b3cb5a3 100644
--- a/megapixels/app/models/sql_factory.py
+++ b/megapixels/app/models/sql_factory.py
@@ -96,22 +96,24 @@ class SqlDataset:
     Get an identity given an ID.
     """
     # id += 1
-    print('fetching {}'.format(id))
-
     file_record_table = self.get_table('file_record')
     file_record = file_record_table.query.filter(file_record_table.id == id).first()
 
+    if not file_record:
+      return None
+
     identity_table = self.get_table('identity')
     identity = identity_table.query.filter(identity_table.id == file_record.identity_id).first()
 
-    if file_record and identity:
-      return {
-        'file_record': file_record.toJSON(),
-        'identity': identity.toJSON(),
-        'face_roi': self.select('face_roi', id),
-        'face_pose': self.select('face_pose', id),
-      }
-    return {}
+    if not identity:
+      return None
+
+    return {
+      'file_record': file_record.toJSON(),
+      'identity': identity.toJSON(),
+      'face_roi': self.select('face_roi', id),
+      'face_pose': self.select('face_pose', id),
+    }
 
   def search_name(self, q):
     """