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

1 files changed, 2 insertions, 3 deletions

diff --git a/cmd-find.c b/cmd-find.c
index edd43a8b..44f50bf7 100644
--- a/cmd-find.c
+++ b/cmd-find.c
@@ -974,9 +974,8 @@ cmd_find_target(struct cmd_find_state *fs, struct cmdq_item *item,
 		fs->current = &current;
 		log_debug("%s: current is from client", __func__);
 	} else
-		return (-1);
-	if (!cmd_find_empty_state(fs->current) &&
-	    !cmd_find_valid_state(fs->current))
+		goto error;
+	if (!cmd_find_valid_state(fs->current))
 		fatalx("invalid current find state");
 
 	/* An empty or NULL target is the current. */