diff --git a/zone/aa.cpp b/zone/aa.cpp
index 472f90d5d..09a954331 100644
--- a/zone/aa.cpp
+++ b/zone/aa.cpp
@@ -109,7 +109,7 @@ void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, u
 		glm::vec2(8, 8), glm::vec2(-8, 8), glm::vec2(8, -8), glm::vec2(-8, -8)
 	};
 
-	NPC* swarm_pet_npc;
+	NPC* swarm_pet_npc = nullptr;
 
 	while (summon_count > 0) {
 		int pet_duration = pet.duration;
@@ -164,7 +164,7 @@ void Mob::TemporaryPets(uint16 spell_id, Mob *targ, const char *name_override, u
 		summon_count--;
 	}
 
-	if (IsClient() && eye_id != nullptr) {
+	if (swarm_pet_npc && IsClient() && eye_id != nullptr) {
 		*eye_id = swarm_pet_npc->GetID();
 	}
 
diff --git a/zone/client_packet.cpp b/zone/client_packet.cpp
index 837d83864..0bb319a20 100644
--- a/zone/client_packet.cpp
+++ b/zone/client_packet.cpp
@@ -4365,7 +4365,7 @@ void Client::Handle_OP_ClientUpdate(const EQApplicationPacket *app) {
 	/* Boat handling */
 	if (ppu->spawn_id != GetID()) {
 		/* If player is controlling boat */
-		if (ppu->spawn_id == controlling_boat_id) {
+		if (ppu->spawn_id && ppu->spawn_id == controlling_boat_id) {
 			Mob *boat = entity_list.GetMob(controlling_boat_id);
 			if (boat == 0) {
 				controlling_boat_id = 0;