diff --git a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHammerThrow.java b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHammerThrow.java
index 03cf62e88..cc9ff1718 100644
--- a/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHammerThrow.java
+++ b/Plugins/Nautilus.Game.Arcade/src/nautilus/game/arcade/kit/perks/PerkHammerThrow.java
@@ -110,9 +110,11 @@ public class PerkHammerThrow extends Perk implements IThrown
 		{
 			Item item = itemIterator.next();
 			
-			if (item.getTicksLived() > 200 || !item.isValid())
+			if (item == null || item.getTicksLived() > 200 || !item.isValid() || item.isDead())
 			{
-				item.remove();
+				if (item != null)
+					item.remove();
+				
 				itemIterator.remove();
 				
 				Player player = _thrown.get(item);
@@ -120,9 +122,6 @@ public class PerkHammerThrow extends Perk implements IThrown
 				if (!Manager.IsAlive(player))
 					continue;
 				
-				if (UtilPlayer.isSpectator(player))
-					continue;
-				
 				_thrown.get(item).getInventory().addItem(ItemStackFactory.Instance.CreateStack(Material.DIAMOND_AXE, (byte)0, 1, F.item("Thor Hammer")));
 			}
 		}