diff --git a/.pick_status.json b/.pick_status.json
index 3638692f8d9..4cb11580aa8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1930,7 +1930,7 @@
         "description": "v3dv: handle allocation failure during pipeline initialization",
         "nominated": true,
         "nomination_type": 0,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": null
     },
diff --git a/src/broadcom/vulkan/v3dv_pipeline.c b/src/broadcom/vulkan/v3dv_pipeline.c
index f2cf9d5bd4e..f466c084a43 100644
--- a/src/broadcom/vulkan/v3dv_pipeline.c
+++ b/src/broadcom/vulkan/v3dv_pipeline.c
@@ -2501,6 +2501,8 @@ pipeline_compile_graphics(struct v3dv_pipeline *pipeline,
     */
    pipeline->shared_data =
       v3dv_pipeline_shared_data_new_empty(pipeline->sha1, pipeline, true);
+   if (!pipeline->shared_data)
+      return VK_ERROR_OUT_OF_HOST_MEMORY;
 
    pipeline->vs->feedback.flags |=
       VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT;
@@ -3203,6 +3205,8 @@ pipeline_compile_compute(struct v3dv_pipeline *pipeline,
    pipeline->shared_data = v3dv_pipeline_shared_data_new_empty(pipeline->sha1,
                                                                pipeline,
                                                                false);
+   if (!pipeline->shared_data)
+      return VK_ERROR_OUT_OF_HOST_MEMORY;
 
    p_stage->feedback.flags |= VK_PIPELINE_CREATION_FEEDBACK_VALID_BIT;