diff --git a/client/room/gamemode.js b/client/room/gamemode.js
index 924e92f..37da486 100644
--- a/client/room/gamemode.js
+++ b/client/room/gamemode.js
@@ -58,10 +58,5 @@ room.Damage.OnDeath.Add(function (player) {
 });
 
 room.Map.OnLoad.Add(() => {
-    for (let player of room.Players.All)
-        blue_team.Add(player);
-    room.Spawns.GetContext().Spawn();
+    for (let player of room.Players.All) blue_team.Add(player);
 });
-room.Players.OnPlayerConnected.Add((player) => {
-    blue_team.Add(player);
-});
\ No newline at end of file
diff --git a/client/room/library.js b/client/room/library.js
index ce4aa64..0ad34c0 100644
--- a/client/room/library.js
+++ b/client/room/library.js
@@ -91,10 +91,11 @@ function ShowBotsCount() {
 }
 bots_timer.OnTimer.Add(function () {
     var player = room.Players.All[0];
+    if (!player) return;
     var look = player.Position;
     look.y += PLAYER_HEAD_HEIGHT;
     for (const bot of room.Bots.All) {
-        bot.LookAt(look);
+        if (bot.Alive) bot.LookAt(look);
     }
     //ShowBotsCount();
 });
@@ -194,4 +195,4 @@ export function set_spawn_area(spawn_area, look_point) {
             ++spawnsCount;
             if (spawnsCount > MAX_SPAWNS_BY_AREA) return;
         }
-}
\ No newline at end of file
+}