diff --git a/sway/commands/move.c b/sway/commands/move.c
index ceeab07c..cdbad13e 100644
--- a/sway/commands/move.c
+++ b/sway/commands/move.c
@@ -921,19 +921,13 @@ struct cmd_results *cmd_move(int argc, char **argv) {
 		--argc; ++argv;
 	}
 
-	if (strcasecmp(argv[0], "window") == 0 ||
-			strcasecmp(argv[0], "container") == 0) {
-		--argc;
-		if (argc > 0) {
-			++argv;
-		}
+	if (argc > 0 && (strcasecmp(argv[0], "window") == 0 ||
+			strcasecmp(argv[0], "container") == 0)) {
+		--argc; ++argv;
 	}
 
-	if (strcasecmp(argv[0], "to") == 0) {
-		--argc;
-		if (argc > 0) {
-			++argv;
-		}
+	if (argc > 0 && strcasecmp(argv[0], "to") == 0) {
+		--argc;	++argv;
 	}
 
 	if (!argc) {