diff --git a/zone/bot.cpp b/zone/bot.cpp
index 9cca12353..e46d8d025 100644
--- a/zone/bot.cpp
+++ b/zone/bot.cpp
@@ -5048,10 +5048,10 @@ bool Bot::Death(Mob *killerMob, int32 damage, uint16 spell_id, EQ::skills::Skill
 			}
 		}
 	}
-	else
-	{
-		entity_list.RemoveBot(this->GetID());
-	}
+//	else
+//	{
+	entity_list.RemoveBot(this->GetID());
+//	}
 	
 	return true;
 }
diff --git a/zone/bot.h b/zone/bot.h
index bef90cf0e..f0cc3510b 100644
--- a/zone/bot.h
+++ b/zone/bot.h
@@ -152,8 +152,8 @@ public:
 		ExtraAttackOptions *opts = nullptr);
 	virtual bool HasRaid() { return (GetRaid() ? true : false); }
 	virtual bool HasGroup() { return (GetGroup() ? true : false); }
-	virtual Raid* GetRaid() { return entity_list.GetRaidByMob(this); }
-	virtual Group* GetGroup() { return entity_list.GetGroupByMob(this); }
+	virtual Raid* GetRaid() { return entity_list.GetRaidByMob(this); } // GetRaidByMob(this);
+	virtual Group* GetGroup() { return entity_list.GetGroupByMob(this); } // GetGroupByMob;
 
 	// Common, but informal "interfaces" with Client object
 	uint32 CharacterID() { return GetBotID(); } // Just returns the Bot Id
diff --git a/zone/mob.cpp b/zone/mob.cpp
index efaf619ef..c51d372f2 100644
--- a/zone/mob.cpp
+++ b/zone/mob.cpp
@@ -3033,7 +3033,8 @@ void Mob::QuestJournalledSay(Client *QuestInitiator, const char *str, Journal::O
 const char *Mob::GetCleanName()
 {
 	if (clean_name != NULL && !strlen(clean_name)) { //extra check added for crash condition.  Mitch
-		CleanMobName(GetName(), clean_name);
+		if (this)
+			CleanMobName(GetName(), clean_name);
 	}
 
 	return clean_name;