diff --git a/userraw/maps/mp/bots/_bot_chat.gsc b/userraw/maps/mp/bots/_bot_chat.gsc
index e983ddc..ed41373 100644
--- a/userraw/maps/mp/bots/_bot_chat.gsc
+++ b/userraw/maps/mp/bots/_bot_chat.gsc
@@ -1196,7 +1196,7 @@ bot_chat_killed_watch( victim )
 			break;
 
 		case 40:
-			if ( isDefined( victim.attackerData[self.guid] ) && isDefined( victim.attackerData[self.guid].weapon ) )
+			if ( isDefined( victim.attackerData ) && isDefined( victim.attackerData[self.guid] ) && isDefined( victim.attackerData[self.guid].weapon ) )
 				message = ( "Man, I sure love my " + getBaseWeaponName( victim.attackerData[self.guid].weapon ) + "!" );
 
 			break;
@@ -1469,7 +1469,7 @@ bot_chat_death_watch( killer, last_ks )
 			break;
 
 		case 60:
-			if ( isDefined( self.attackerData[killer.guid] ) && isDefined( self.attackerData[killer.guid].weapon ) )
+			if ( isDefined( self.attackerData ) && isDefined( self.attackerData[killer.guid] ) && isDefined( self.attackerData[killer.guid].weapon ) )
 				message = "Wow! Nice " + getBaseWeaponName( self.attackerData[killer.guid].weapon ) + " you got there, " + killer.name + "!";
 
 			break;
@@ -2129,6 +2129,11 @@ bot_chat_follow_watch( state, player, time, d, e, f, g )
 {
 	self endon( "disconnect" );
 
+	if ( !isDefined( player ) )
+	{
+		return;
+	}
+
 	switch ( state )
 	{
 		case "start":