diff --git a/daemons/lvmlockd/lvmlockd-core.c b/daemons/lvmlockd/lvmlockd-core.c
index b271a9aee..094491029 100644
--- a/daemons/lvmlockd/lvmlockd-core.c
+++ b/daemons/lvmlockd/lvmlockd-core.c
@@ -2682,7 +2682,7 @@ out_rem:
 
 	log_debug("S %s clearing locks", ls->name);
 
-	rv = clear_locks(ls, free_vg, drop_vg);
+	(void) clear_locks(ls, free_vg, drop_vg);
 
 	/*
 	 * Tell any other hosts in the lockspace to leave it
diff --git a/tools/vgimportdevices.c b/tools/vgimportdevices.c
index 88435af92..af0e618aa 100644
--- a/tools/vgimportdevices.c
+++ b/tools/vgimportdevices.c
@@ -113,7 +113,7 @@ int vgimportdevices(struct cmd_context *cmd, int argc, char **argv)
 {
 	struct vgimportdevices_params vp = { 0 };
 	struct processing_handle *handle;
-	int ret = ECMD_PROCESSED;
+	int ret = ECMD_FAILED;
 
 	if (arg_is_set(cmd, foreign_ARG))
 		cmd->include_foreign_vgs = 1;
@@ -152,7 +152,6 @@ int vgimportdevices(struct cmd_context *cmd, int argc, char **argv)
 
 	if (!(handle = init_processing_handle(cmd, NULL))) {
 		log_error("Failed to initialize processing handle.");
-		ret = ECMD_FAILED;
 		goto out;
 	}
 	handle->custom_handle = &vp;