diff --git a/common/cmd_nvedit.c b/common/cmd_nvedit.c
index 3fd8abc157f98f4f67326a90ceea5acbe6a77d25..52c5e7c30d755e6513f3f8445182cbd30709b1fd 100644
--- a/common/cmd_nvedit.c
+++ b/common/cmd_nvedit.c
@@ -848,6 +848,9 @@ static int do_env (cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 {
 	cmd_tbl_t *cp;
 
+	if (argc < 2)
+		return cmd_usage(cmdtp);
+
 	/* drop initial "env" arg */
 	argc--;
 	argv++;