diff --git a/zone/bot_command.cpp b/zone/bot_command.cpp
index 6e86ecdd4..482cab3e3 100644
--- a/zone/bot_command.cpp
+++ b/zone/bot_command.cpp
@@ -1621,33 +1621,27 @@ uint32 helper_bot_create(Client *bot_owner, std::string bot_name, uint8 bot_clas
 		bot_owner->Message(
 			Chat::Yellow,
 			fmt::format(
-				"'{}' is an invalid name. You may only use characters 'A-Z' or 'a-z' and it must be between 4 and 15 characters. Mixed case {} allowed.",
+				"'{}' is an invalid name. You may only use characters 'A-Z' or 'a-z' and it must be between 4 and 15 characters with no spaces. Mixed case {} allowed.",
 				bot_name, RuleB(Bots, AllowCamelCaseNames) ? "is" : "is not"
 			).c_str()
 		);
+
 		return bot_id;
 	}
 
 	bool available_flag = false;
-	if (!database.botdb.QueryNameAvailablity(bot_name, available_flag)) {
-		bot_owner->Message(
-			Chat::Yellow,
-			fmt::format(
-				"'{}' is already in use or an invalid name.",
-				bot_name
-			).c_str()
-		);
-		return bot_id;
-	}
+
+	!database.botdb.QueryNameAvailablity(bot_name, available_flag);
 
 	if (!available_flag) {
 		bot_owner->Message(
 			Chat::Yellow,
 			fmt::format(
-				"The name '{}' is already being used. Please choose a different name",
+				"The name '{}' is already being used or prohibited. Please choose a different name",
 				bot_name
 			).c_str()
 		);
+
 		return bot_id;
 	}
 
diff --git a/zone/bot_commands/bot.cpp b/zone/bot_commands/bot.cpp
index 78921d9a0..c836888b2 100644
--- a/zone/bot_commands/bot.cpp
+++ b/zone/bot_commands/bot.cpp
@@ -121,35 +121,29 @@ void bot_command_clone(Client *c, const Seperator *sep)
 
 	if (!Bot::IsValidName(bot_name)) {
 		c->Message(
-			Chat::White,
+			Chat::Yellow,
 			fmt::format(
-				"'{}' is an invalid name. You may only use characters 'A-Z', 'a-z' and '_'.",
-				bot_name
+				"'{}' is an invalid name. You may only use characters 'A-Z' or 'a-z' and it must be between 4 and 15 characters. Mixed case {} allowed.",
+				bot_name, RuleB(Bots, AllowCamelCaseNames) ? "is" : "is not"
 			).c_str()
 		);
+
 		return;
 	}
 
 	bool available_flag = false;
-	if (!database.botdb.QueryNameAvailablity(bot_name, available_flag)) {
-		c->Message(
-			Chat::White,
-			fmt::format(
-				"Failed to query name availability for '{}'.",
-				bot_name
-			).c_str()
-		);
-		return;
-	}
+
+	!database.botdb.QueryNameAvailablity(bot_name, available_flag);
 
 	if (!available_flag) {
 		c->Message(
-			Chat::White,
+			Chat::Yellow,
 			fmt::format(
-				"The name '{}' is already being used. Please choose a different name.",
+				"The name '{}' is already being used or prohibited. Please choose a different name",
 				bot_name
 			).c_str()
 		);
+
 		return;
 	}