diff --git a/zone/aura.cpp b/zone/aura.cpp
index 17c12abdd..178ca1700 100644
--- a/zone/aura.cpp
+++ b/zone/aura.cpp
@@ -690,12 +690,16 @@ void Aura::ProcessSpawns()
 			continue;
 		}
 
-		if (!e.second->IsOfClientBot()) {
+		if (!e.second->IsClient()) {
 			continue;
 		}
 
 		auto c = e.second->CastToClient();
 
+		if (!c) {
+			continue;
+		}
+
 		bool spawned = spawned_for.find(c->GetID()) != spawned_for.end();
 		if (ShouldISpawnFor(c)) {
 			if (!spawned) {
diff --git a/zone/bot.cpp b/zone/bot.cpp
index e27fa1c4f..998fd7757 100644
--- a/zone/bot.cpp
+++ b/zone/bot.cpp
@@ -3615,6 +3615,7 @@ void Bot::BotPullerProcess(Client* bot_owner, Raid* raid) {
 void Bot::Depop() {
 	WipeHateList();
 	entity_list.RemoveFromHateLists(this);
+	RemoveAllAuras();
 
 	if (HasPet())
 		GetPet()->Depop();