diff --git a/guix-data-service/model/build-status.scm b/guix-data-service/model/build-status.scm
index bbf079f..b7a8813 100644
--- a/guix-data-service/model/build-status.scm
+++ b/guix-data-service/model/build-status.scm
@@ -60,7 +60,11 @@ SELECT timestamp, status
 FROM latest_build_status
 WHERE build_id = $1")
 
-  (exec-query conn query (list (number->string build-id))))
+  (match (exec-query conn query (list (number->string build-id)))
+    (() #f)
+    (((timestamp status))
+     (values status
+             timestamp))))
 
 (define (insert-build-status conn build-id timestamp status)
   (insert-build-statuses