diff --git a/cmd_parser.c b/cmd_parser.c
index 05f1f26..fe33db0 100644
--- a/cmd_parser.c
+++ b/cmd_parser.c
@@ -1686,8 +1686,8 @@ void cmd_parser(void) __banked
 				stp_off();
 				stpEnabled = 0;
 			}
-		} else if (cmd_compare(0, "pvid") && cmd_words_len == 3) {
-			if (cmd_parse_port_separator(cmd_words_b[1]) != 0 && atoi_results_u8
+		} else if (cmd_compare(0, "pvid")) {
+			if (cmd_words_len == 3 && cmd_parse_port_separator(cmd_words_b[1]) != 0
 			    && atoi_short(cmd_words_b[2]) && atoi_results_short && atoi_results_short <= 4094)
 				port_pvid_set(atoi_results_u8, atoi_results_short);
 			else