diff --git a/db/builder_db.ml b/db/builder_db.ml
index 6ea1ba8..cdcd190 100644
--- a/db/builder_db.ml
+++ b/db/builder_db.ml
@@ -311,16 +311,15 @@ module Build = struct
     |}
 
   let get_latest_successful_with_binary =
-    Caqti_type.(tup2 (id `job) string) ->? Caqti_type.tup3 (id `build) t file_opt @@
+    Caqti_type.(tup2 (id `job) string) ->? Caqti_type.tup3 (id `build) t file @@
     {| SELECT b.id,
          b.uuid, b.start_d, b.start_ps, b.finish_d, b.finish_ps,
          b.result_code, b.result_msg, b.console, b.script,
          b.platform, b.main_binary, b.input_id, b.user, b.job,
          a.filepath, a.localpath, a.sha256, a.size
-       FROM build b
-       LEFT JOIN build_artifact a ON
-         b.main_binary = a.id
-       WHERE b.job = $1 AND b.platform = $2
+       FROM build b, build_artifact a
+       WHERE b.main_binary = a.id AND b.job = $1 AND b.platform = $2
+         AND b.main_binary IS NOT NULL
        ORDER BY b.start_d DESC, b.start_ps DESC
        LIMIT 1
     |}
@@ -348,6 +347,7 @@ module Build = struct
        FROM build b, build b0, build_artifact a, build_artifact a0
        WHERE b0.id = ? AND b0.job = b.job AND
          b.platform = b0.platform AND
+         b.main_binary IS NOT NULL AND
          a.id = b.main_binary AND a0.id = b0.main_binary AND
          a.sha256 <> a0.sha256 AND
          (b0.start_d > b.start_d OR b0.start_d = b.start_d AND b0.start_ps > b.start_ps)
@@ -364,6 +364,7 @@ module Build = struct
        FROM build b, build b0, build_artifact a, build_artifact a0
        WHERE b0.id = ? AND b0.job = b.job AND
          b.platform = b0.platform AND
+         b.main_binary IS NOT NULL AND
          a.id = b.main_binary AND a0.id = b0.main_binary AND
          a.sha256 <> a0.sha256 AND
          (b0.start_d < b.start_d OR b0.start_d = b.start_d AND b0.start_ps < b.start_ps)