Log error properly when no current state, and some other minor tweaks.

1 files changed, 3 insertions, 3 deletions

diff --git a/cmd-queue.c b/cmd-queue.c
index a7a29b58..99ec6055 100644
--- a/cmd-queue.c
+++ b/cmd-queue.c
@@ -203,14 +203,14 @@ cmdq_fire_command(struct cmdq_item *item)
 	flags = !!(cmd->flags & CMD_CONTROL);
 	cmdq_guard(item, "begin", flags);
 
+	if (item->client == NULL)
+		item->client = cmd_find_client(item, NULL, 1);
+
 	if (cmd_prepare_state(cmd, item) != 0) {
 		retval = CMD_RETURN_ERROR;
 		goto out;
 	}
 
-	if (item->client == NULL)
-		item->client = cmd_find_client(item, NULL, 1);
-
 	retval = cmd->entry->exec(cmd, item);
 	if (retval == CMD_RETURN_ERROR)
 		goto out;