diff --git a/zone/gm_commands/modifynpcstat.cpp b/zone/gm_commands/modifynpcstat.cpp
index 75047caf9..463e625f1 100755
--- a/zone/gm_commands/modifynpcstat.cpp
+++ b/zone/gm_commands/modifynpcstat.cpp
@@ -16,8 +16,14 @@ void command_modifynpcstat(Client *c, const Seperator *sep)
 
 	auto target = c->GetTarget()->CastToNPC();
 
-	std::string stat = sep->arg[1];
-	std::string value = sep->arg[2] ? sep->arg[2] : "";
+	const std::string& stat  = sep->arg[1] ? sep->arg[1] : "";
+	const std::string& value = sep->arg[2] ? sep->arg[2] : "";
+
+	if (stat.empty() || value.empty()) {
+		c->Message(Chat::White, "Usage: #modifynpcstat [Stat] [Value]");
+		ListModifyNPCStatMap(c);
+		return;
+	}
 
 	auto stat_description = GetModifyNPCStatDescription(stat);
 	if (!stat_description.length()) {