diff --git a/zone/gm_commands/summon.cpp b/zone/gm_commands/summon.cpp
index 6a4c568d8..d6bdea88b 100755
--- a/zone/gm_commands/summon.cpp
+++ b/zone/gm_commands/summon.cpp
@@ -58,12 +58,17 @@ void command_summon(Client *c, const Seperator *sep)
 	} else if (c->GetTarget()) {
 		target = c->GetTarget();
 	}
-	
+
 	if (c == target) {
 		c->Message(Chat::White, "You cannot summon yourself.");
 		return;
 	}
-	
+
+	if (!target) {
+		c->Message(Chat::White, "You must have a target to summon.");
+		return;
+	}
+
 	c->Message(
 		Chat::White,
 		fmt::format(
diff --git a/zone/mob.cpp b/zone/mob.cpp
index 09cdee6b9..1a4a20ba4 100644
--- a/zone/mob.cpp
+++ b/zone/mob.cpp
@@ -5114,7 +5114,7 @@ std::string Mob::GetTargetDescription(Mob* target, uint8 description_type, uint1
 	auto d = fmt::format(
 		"{}",
 		(
-			this == target ?
+			target && this == target ?
 			self_return :
 			fmt::format(
 				"{} ({})",