diff --git a/src/udev/scsi_id/scsi_id.c b/src/udev/scsi_id/scsi_id.c
index 295819351d..93b65816e4 100644
--- a/src/udev/scsi_id/scsi_id.c
+++ b/src/udev/scsi_id/scsi_id.c
@@ -328,10 +328,13 @@ static int per_dev_options(struct scsi_id_device *dev_scsi, int *good_bad, enum
                         r = parse_page_code(opts.arg, page_code);
                         if (r < 0)
                                 return r;
-                } else
+                } else {
+                        _cleanup_free_ char *synopsis =
+                                option_get_synopsis(opts.opt, "/", /* show_metavar=*/ false);
                         return log_error_errno(SYNTHETIC_ERRNO(EINVAL),
                                                "Option %s not supported in the config file.",
-                                               strnull(option_get_synopsis(opts.opt, "/", /* show_metavar=*/ false)));
+                                               strnull(synopsis));
+                }
 
         return 0;
 }
diff --git a/src/vmspawn/vmspawn-qmp.c b/src/vmspawn/vmspawn-qmp.c
index 621c5e781a..d09576213a 100644
--- a/src/vmspawn/vmspawn-qmp.c
+++ b/src/vmspawn/vmspawn-qmp.c
@@ -730,23 +730,26 @@ static int drive_info_add_fail(DriveInfo *d, int error, const char *error_desc)
         if (FLAGS_SET(d->state, BLOCK_DEVICE_STATE_ADD_FAILED))
                 return 0;
 
-        vmspawn_qmp_block_device_teardown(d->bridge->qmp, d->qmp_node_name, d->state);
-        d->state = BLOCK_DEVICE_STATE_ADD_FAILED;
+        /* Pin the object alive across bridge_unregister_drive() + drive_info_unref() below. */
+        _cleanup_(drive_info_unrefp) DriveInfo *ref = drive_info_ref(d);
 
-        if (bridge_unregister_drive(d->bridge, d))
-                drive_info_unref(d);
+        vmspawn_qmp_block_device_teardown(ref->bridge->qmp, ref->qmp_node_name, ref->state);
+        ref->state = BLOCK_DEVICE_STATE_ADD_FAILED;
 
-        if (d->link) {
-                (void) reply_qmp_error(d->link, error_desc, error);
-                d->link = sd_varlink_unref(d->link);
+        if (bridge_unregister_drive(ref->bridge, ref))
+                drive_info_unref(ref);
+
+        if (ref->link) {
+                (void) reply_qmp_error(ref->link, error_desc, error);
+                ref->link = sd_varlink_unref(ref->link);
                 return 0;
         }
 
         log_error_errno(error, "Block device '%s' setup failed: %s",
-                        strna(d->id), strna(error_desc));
+                        strna(ref->id), strna(error_desc));
 
         /* Boot-time (link == NULL) is always fatal — even for late-arriving ephemeral replies. */
-        return sd_event_exit(qmp_client_get_event(d->bridge->qmp), error);
+        return sd_event_exit(qmp_client_get_event(ref->bridge->qmp), error);
 }
 
 /* Rolls back the up-front registry insert on a sync error path. */