diff --git a/.pick_status.json b/.pick_status.json
index d10cf081163..fae8c56b0a3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -2524,7 +2524,7 @@
         "description": "frontends/va: Add missing NULL check for additional output surface",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "efc6d27fd4bf863f205e1218bc89260c21f8b983",
         "notes": null
diff --git a/src/gallium/frontends/va/postproc.c b/src/gallium/frontends/va/postproc.c
index a2e3a148a47..bfa38eaf784 100644
--- a/src/gallium/frontends/va/postproc.c
+++ b/src/gallium/frontends/va/postproc.c
@@ -553,6 +553,8 @@ vlVaHandleVAProcPipelineParameterBufferType(vlVaDriver *drv, vlVaContext *contex
          return VA_STATUS_ERROR_INVALID_PARAMETER;
 
       dst_surface = handle_table_get(drv->htab, param->additional_outputs[0]);
+      if (!dst_surface)
+         return VA_STATUS_ERROR_INVALID_SURFACE;
    }
 
    src_region = vlVaRegionDefault(param->surface_region, src_surface, &def_src_region);