diff --git a/source/WorldServer/client.cpp b/source/WorldServer/client.cpp
index fadd15f..5a32d0d 100644
--- a/source/WorldServer/client.cpp
+++ b/source/WorldServer/client.cpp
@@ -5146,7 +5146,7 @@ void Client::Zone(ZoneChangeDetails* new_zone, ZoneServer* opt_zone, bool set_co
 	}
 
 	// block out the member info for the group
-	TempRemoveGroup();
+	TempRemoveGroup(zoning_id, zoning_instance_id);
 
 	UpdateTimeStampFlag(ZONE_UPDATE_FLAG);
 
@@ -12666,7 +12666,7 @@ void Client::AddItemSale(int64 unique_id, int32 item_id, int64 price, int32 inv_
 }
 bool Client::HandleHouseEntityCommands(Spawn* spawn, int32 spawnid, string command)
 {
-	if (GetCurrentZone()->GetInstanceType() != PERSONAL_HOUSE_INSTANCE)
+	if (!GetCurrentZone() || GetCurrentZone()->GetInstanceType() != PERSONAL_HOUSE_INSTANCE)
 		return false;
 
 	if (command == "house_spawn_examine")
@@ -12995,7 +12995,7 @@ void Client::ReplaceGroupClient(Client* new_client)
 	}
 }
 
-void Client::TempRemoveGroup()
+void Client::TempRemoveGroup(int32 zone_id, int32 instance_id)
 {
 	if (this->GetPlayer()->GetGroupMemberInfo())
 	{
@@ -13007,6 +13007,10 @@ void Client::TempRemoveGroup()
 			rejoin_group_id = this->GetPlayer()->GetGroupMemberInfo()->group_id;
 			this->GetPlayer()->GetGroupMemberInfo()->client = 0;
 			this->GetPlayer()->GetGroupMemberInfo()->member = 0;
+			if(zone_id) {
+				this->GetPlayer()->GetGroupMemberInfo()->zone_id = zone_id;
+				this->GetPlayer()->GetGroupMemberInfo()->instance_id = instance_id;
+			}
 			this->GetPlayer()->SetGroupMemberInfo(0);
 			group->MGroupMembers.releasewritelock();
 			group->RemoveClientReference(this);
diff --git a/source/WorldServer/client.h b/source/WorldServer/client.h
index 1e42d56..55de68b 100644
--- a/source/WorldServer/client.h
+++ b/source/WorldServer/client.h
@@ -604,7 +604,7 @@ public:
 
 	void SetRejoinGroupID(int32 id) { rejoin_group_id = id; }
 
-	void TempRemoveGroup();
+	void TempRemoveGroup(int32 zone_id = 0, int32 instance_id = 0);
 	void ReplaceGroupClient(Client* new_client);
 
 	void SendWaypoints();