diff --git a/common/cmd_nand.c b/common/cmd_nand.c
index a6b67e29f1..190275d049 100644
--- a/common/cmd_nand.c
+++ b/common/cmd_nand.c
@@ -415,7 +415,8 @@ static int do_nand(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 		}
 
 		dev = (int)simple_strtoul(argv[2], NULL, 10);
-		set_dev(dev);
+		if (set_dev(dev))
+			return 1;
 
 		return 0;
 	}