diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index d5dde9750..94b014243 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -3956,9 +3956,11 @@ void Client::Handle_OP_Camp(const EQApplicationPacket *app)
 #ifdef BOTS
 	// This block is necessary to clean up any bot objects owned by a Client
 	Bot::BotOrderCampAll(this);
-	auto group = GetGroup();
-	if (group && group->GroupCount() < 2)
-		group->DisbandGroup();
+	// Evidently, this is bad under certain conditions and causes crashes...
+	// Group and Raid code really needs to be overhauled to account for non-client types (mercs and bots)
+	//auto group = GetGroup();
+	//if (group && group->GroupCount() < 2)
+	//	group->DisbandGroup();
 #endif
 	if (IsLFP())
 		worldserver.StopLFP(CharacterID());