diff --git a/src/gallium/drivers/zink/zink_resource.c b/src/gallium/drivers/zink/zink_resource.c
index 060f54babf0..79ab3542c7e 100644
--- a/src/gallium/drivers/zink/zink_resource.c
+++ b/src/gallium/drivers/zink/zink_resource.c
@@ -840,7 +840,9 @@ map_resource(struct zink_screen *screen, struct zink_resource *res)
    assert(res->obj->host_visible);
    result = vkMapMemory(screen->dev, res->obj->mem, res->obj->offset,
                         res->obj->size, 0, &res->obj->map);
-   return result == VK_SUCCESS ? res->obj->map : NULL;
+   if (zink_screen_handle_vkresult(screen, result))
+      return res->obj->map;
+   return NULL;
 }
 
 static void