diff --git a/stand/common/module.c b/stand/common/module.c
index 9b001089149d..e6567c735f36 100644
--- a/stand/common/module.c
+++ b/stand/common/module.c
@@ -424,13 +424,15 @@ command_pnpload(int argc, char *argv[])
 			return(CMD_OK);
 		}
 	}
-	argv += (optind - 1);
-	argc -= (optind - 1);
+	argv += optind;
+	argc -= optind;
 
-	if (argc != 2)
+	if (argc != 2) {
+		command_errmsg = "Usage: pnpload <busname> compat=<compatdata>";
 		return (CMD_ERROR);
+	}
 
-	module = mod_searchmodule_pnpinfo(argv[1], argv[2]);
+	module = mod_searchmodule_pnpinfo(argv[0], argv[1]);
 
 	error = mod_load(module, NULL, 0, NULL);
 	if (error == EEXIST) {