diff --git a/commands/of_node.c b/commands/of_node.c
index 29cc371..28c4357 100644
--- a/commands/of_node.c
+++ b/commands/of_node.c
@@ -107,11 +107,10 @@
 		}
 	}
 
-	if (optind == argc)
+	if (optind + 1 != argc)
 		return COMMAND_ERROR_USAGE;
 
-	if (optind < argc)
-		path = argv[optind];
+	path = argv[optind];
 
 	if (!path)
 		return COMMAND_ERROR_USAGE;
@@ -147,7 +146,7 @@
 BAREBOX_CMD_START(of_node)
 	.cmd		= do_of_node,
 	BAREBOX_CMD_DESC("create/delete nodes in the device tree")
-	BAREBOX_CMD_OPTS("[-cd] [-f] NODE NAME")
+	BAREBOX_CMD_OPTS("[-cd] [-f] NODEPATH")
 	BAREBOX_CMD_GROUP(CMD_GRP_MISC)
 	BAREBOX_CMD_COMPLETE(devicetree_complete)
 	BAREBOX_CMD_HELP(cmd_of_node_help)