diff --git a/src/main/java/com/alttd/ctf/events/OnPlayerOnlineStatus.java b/src/main/java/com/alttd/ctf/events/OnPlayerOnlineStatus.java
index 699efe6..8e28b64 100644
--- a/src/main/java/com/alttd/ctf/events/OnPlayerOnlineStatus.java
+++ b/src/main/java/com/alttd/ctf/events/OnPlayerOnlineStatus.java
@@ -42,6 +42,8 @@ public class OnPlayerOnlineStatus implements Listener {
         resetPlayer(player);
         handleRunningGame(player);
         handleDiscordLink(player);
+       gameManager.getTeamPlayer(player).ifPresent(teamPlayer ->
+               player.teleportAsync(teamPlayer.getTeam().getSpawnLocation()));
     }
 
     private void handleRunningGame(Player player) {
diff --git a/src/main/java/com/alttd/ctf/events/OtherGameEvents.java b/src/main/java/com/alttd/ctf/events/OtherGameEvents.java
index 8d3306f..d1e2282 100644
--- a/src/main/java/com/alttd/ctf/events/OtherGameEvents.java
+++ b/src/main/java/com/alttd/ctf/events/OtherGameEvents.java
@@ -33,7 +33,6 @@ public class OtherGameEvents implements Listener {
             log.info("no game phases");
             return;
         }
-        log.info(event.getBlock().getType().toString());
         if (!Tag.SNOW.isTagged(event.getBlock().getType())) {
             event.setCancelled(true);
             return;
diff --git a/src/main/java/com/alttd/ctf/events/SnowballEvent.java b/src/main/java/com/alttd/ctf/events/SnowballEvent.java
index ea89f6b..23d6dc4 100644
--- a/src/main/java/com/alttd/ctf/events/SnowballEvent.java
+++ b/src/main/java/com/alttd/ctf/events/SnowballEvent.java
@@ -88,6 +88,10 @@ public class SnowballEvent implements Listener {
     public void onSnowballThrown(ProjectileLaunchEvent event) {
         handleSnowballThrown(event, (shooter, shooterTeamPlayer, snowball) -> {
             GameClass shooterClass = shooterTeamPlayer.getGameClass();
+            if (shooterClass == null) {
+                event.setCancelled(true);
+                return;
+            }
             shooter.setCooldown(Material.SNOWBALL, shooterClass.getThrowTickSpeed());
             shooterTeamPlayer.increaseStat(Stat.SNOWBALLS_THROWN);
             if (shooterClass instanceof Mage mage) {