diff --git a/endpoints/api.py b/endpoints/api.py
index c6bd504a3..1ff574d24 100644
--- a/endpoints/api.py
+++ b/endpoints/api.py
@@ -1160,15 +1160,12 @@ def get_job_config(build_obj):
 
 def build_status_view(build_obj, can_write=False):
   status = build_logs.get_status(build_obj.uuid)
-  if not status:
-    status = 'cannot_load'
-
   return {
     'id': build_obj.uuid,
-    'phase': build_obj.phase,
+    'phase': build_obj.phase if status else 'cannot_load',
     'started': build_obj.started,
     'display_name': build_obj.display_name,
-    'status': status,
+    'status': status or {},
     'job_config': get_job_config(build_obj) if can_write else None,
     'is_writer': can_write,
     'trigger': trigger_view(build_obj.trigger),