diff --git a/build-number.txt b/build-number.txt
index dea24def..ac2fca59 100644
--- a/build-number.txt
+++ b/build-number.txt
@@ -1 +1 @@
-1177
\ No newline at end of file
+1178
\ No newline at end of file
diff --git a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java
index 795ff0b6..940d7e58 100644
--- a/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java
+++ b/src/main/java/me/chayapak1/chomens_bot/plugins/TeamJoinerPlugin.java
@@ -21,20 +21,24 @@ public class TeamJoinerPlugin extends TickPlugin.Listener {
 
     @Override
     public void onTick () {
-        final Team team = bot.team.findTeamByName(teamName);
+        try {
+            final Team team = bot.team.findTeamByName(teamName);
 
-        if (team == null) {
-            addTeam();
-            return;
-        }
-
-        if (!team.players.contains(bot.username)) joinTeam();
-
-        for (String player : new ArrayList<>(team.players)) {
-            if (!player.equals(bot.username)) {
-                excludeOthers();
-                break;
+            if (team == null) {
+                addTeam();
+                return;
             }
+
+            if (!team.players.contains(bot.username)) joinTeam();
+
+            for (String player : new ArrayList<>(team.players)) {
+                if (!player.equals(bot.username)) {
+                    excludeOthers();
+                    break;
+                }
+            }
+        } catch (Exception e) {
+            e.printStackTrace();
         }
     }