diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/snowman/SmashSnowman.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/snowman/SmashSnowman.java
index 613aa5bf4..c5dc0a692 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/snowman/SmashSnowman.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/game/games/smash/perks/snowman/SmashSnowman.java
@@ -106,7 +106,7 @@ public class SmashSnowman extends SmashUltimate
 		{
 			Snowman snowman = turretIter.next();
 			Player player = _turret.get(snowman);
-			Player target = UtilPlayer.getClosest(snowman.getLocation(), player);
+			Player target = UtilPlayer.getClosest(snowman.getLocation(), Manager.GetGame().GetTeam(player).GetPlayers(true));
 
 			if (target == null)
 			{
@@ -150,8 +150,10 @@ public class SmashSnowman extends SmashUltimate
 		{
 			return;
 		}
+		
+		Player damager = _snowball.get(proj);
 
-		if (!_snowball.containsKey(proj))
+		if (damager == null)
 		{
 			return;
 		}
@@ -165,7 +167,7 @@ public class SmashSnowman extends SmashUltimate
 
 		event.SetCancelled("Turret");
 
-		if (damagee.equals(_snowball.get(proj)))
+		if(Manager.GetGame().GetTeam(damager).GetPlayers(true).contains(damagee))
 		{
 			return;
 		}
@@ -183,7 +185,7 @@ public class SmashSnowman extends SmashUltimate
 			return;
 		}
 
-		Manager.GetDamage().NewDamageEvent(damagee, _snowball.get(proj), null, DamageCause.PROJECTILE, 2, false, true, false, UtilEnt.getName(_snowball.get(proj)), GetName());
+		Manager.GetDamage().NewDamageEvent(damagee, damager, null, DamageCause.PROJECTILE, 2, false, true, false, UtilEnt.getName(_snowball.get(proj)), GetName());
 	}
 
 	@EventHandler