diff --git a/.pick_status.json b/.pick_status.json
index f90f25e8156..b4a0a9fe24a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1525,7 +1525,7 @@
         "description": "hasvk: check the return value of anv_execbuf_add_bo_bitset()",
         "nominated": false,
         "nomination_type": null,
-        "resolution": 4,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/intel/vulkan_hasvk/anv_batch_chain.c b/src/intel/vulkan_hasvk/anv_batch_chain.c
index 8fbf3f224fd..1a14a34f0b1 100644
--- a/src/intel/vulkan_hasvk/anv_batch_chain.c
+++ b/src/intel/vulkan_hasvk/anv_batch_chain.c
@@ -1692,9 +1692,11 @@ setup_execbuf_for_cmd_buffer(struct anv_execbuf *execbuf,
          return result;
    } else {
       /* Add surface dependencies (BOs) to the execbuf */
-      anv_execbuf_add_bo_bitset(cmd_buffer->device, execbuf,
-                                cmd_buffer->surface_relocs.dep_words,
-                                cmd_buffer->surface_relocs.deps, 0);
+      result = anv_execbuf_add_bo_bitset(cmd_buffer->device, execbuf,
+                                         cmd_buffer->surface_relocs.dep_words,
+                                         cmd_buffer->surface_relocs.deps, 0);
+      if (result != VK_SUCCESS)
+         return result;
    }
 
    /* First, we walk over all of the bos we've seen and add them and their