diff --git a/.pick_status.json b/.pick_status.json
index cef1b8d0428..0c0cbf94df4 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1864,7 +1864,7 @@
         "description": "crocus: properly free resources on BO allocation failure",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "f3630548f1da904ec6c63b43ece7e68afdb8867e",
         "notes": null
diff --git a/src/gallium/drivers/crocus/crocus_resource.c b/src/gallium/drivers/crocus/crocus_resource.c
index b56c1d96276..778d2b735b8 100644
--- a/src/gallium/drivers/crocus/crocus_resource.c
+++ b/src/gallium/drivers/crocus/crocus_resource.c
@@ -803,7 +803,7 @@ crocus_resource_from_handle(struct pipe_screen *pscreen,
       unreachable("invalid winsys handle type");
    }
    if (!res->bo)
-      return NULL;
+      goto fail;
 
    res->offset = whandle->offset;
    res->external_format = whandle->format;