diff --git a/CMakeLists.txt b/CMakeLists.txt
index 10f2362c3..7ad551966 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -266,10 +266,11 @@ IF(EQEMU_BUILD_LUA)
 	ADD_DEFINITIONS(-DLUA_EQEMU)
 ENDIF(EQEMU_BUILD_LUA)
 
-OPTION(EQEMU_USE_MAP_MMFS "Create and use Zone Map MMF files." OFF)
-IF(EQEMU_USE_MAP_MMFS)
-	ADD_DEFINITIONS(-DUSE_MAP_MMFS)
-ENDIF(EQEMU_USE_MAP_MMFS)
+#Disabled until reevaluation performed
+#OPTION(EQEMU_USE_MAP_MMFS "Create and use Zone Map MMF files." OFF)
+#IF(EQEMU_USE_MAP_MMFS)
+#	ADD_DEFINITIONS(-DUSE_MAP_MMFS)
+#ENDIF(EQEMU_USE_MAP_MMFS)
 
 SET(EQEMU_MAP_DIR "./Maps" CACHE STRING "The dir that maps, water maps, and paths are located in.")
 
diff --git a/zone/attack.cpp b/zone/attack.cpp
index db991ca72..769568f34 100644
--- a/zone/attack.cpp
+++ b/zone/attack.cpp
@@ -2689,16 +2689,24 @@ void Mob::AddToHateList(Mob* other, uint32 hate /*= 0*/, int32 damage /*= 0*/, b
 
 #ifdef BOTS
 	// if other is a bot, add the bots client to the hate list
-	if (other->IsBot()) {
-		if (other->CastToBot()->GetBotOwner() && other->CastToBot()->GetBotOwner()->CastToClient()->GetFeigned()) {
-			AddFeignMemory(other->CastToBot()->GetBotOwner()->CastToClient());
+	while (other->IsBot()) {
+		auto other_ = other->CastToBot();
+		if (!other_ || !other_->GetBotOwner())
+			break;
+
+		auto owner_ = other_->GetBotOwner()->CastToClient();
+		if (!owner_ || owner_->IsDead() || !owner_->InZone()) // added isdead and inzone checks to avoid issues in AddAutoXTarget(...) below
+			break;
+
+		if (owner_->GetFeigned()) {
+			AddFeignMemory(owner_);
 		}
-		else {
-			if (!hate_list.IsEntOnHateList(other->CastToBot()->GetBotOwner())) {
-				hate_list.AddEntToHateList(other->CastToBot()->GetBotOwner(), 0, 0, false, true);
-				other->CastToBot()->GetBotOwner()->CastToClient()->AddAutoXTarget(this);
-			}
+		else if (!hate_list.IsEntOnHateList(owner_)) {
+			hate_list.AddEntToHateList(owner_, 0, 0, false, true);
+			owner_->AddAutoXTarget(this); // this was being called on dead/out-of-zone clients
 		}
+
+		break;
 	}
 #endif //BOTS
 
@@ -2710,6 +2718,7 @@ void Mob::AddToHateList(Mob* other, uint32 hate /*= 0*/, int32 damage /*= 0*/, b
 		else {
 			if (!hate_list.IsEntOnHateList(other->CastToMerc()->GetMercOwner()))
 				hate_list.AddEntToHateList(other->CastToMerc()->GetMercOwner(), 0, 0, false, true);
+			// if mercs are reworked to include adding 'this' to owner's xtarget list, this should reflect bots code above
 		}
 	} //MERC
 
@@ -5467,4 +5476,4 @@ int32 Mob::GetHPRegen() const
 int32 Mob::GetManaRegen() const
 {
 	return mana_regen;
-}
\ No newline at end of file
+}