diff --git a/userraw/maps/mp/bots/_bot.gsc b/userraw/maps/mp/bots/_bot.gsc
index e6336d9..27e74e4 100644
--- a/userraw/maps/mp/bots/_bot.gsc
+++ b/userraw/maps/mp/bots/_bot.gsc
@@ -352,6 +352,8 @@ onPlayerConnect()
 	for(;;)
 	{
 		level waittill("connected", player);
+
+		player.bot_isScrambled = false;
 		
 		player thread onGrenadeFire();
 		player thread onWeaponFired();
@@ -808,6 +810,10 @@ onGrenadeFire()
 	for(;;)
 	{
 		self waittill ( "grenade_fire", grenade, weaponName );
+
+		if (!isDefined(grenade))
+			continue;
+
 		grenade.name = weaponName;
 
 		if(weaponName == "smoke_grenade_mp")