diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/VitalitySpores.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/VitalitySpores.java
index fb174c112..db7e4e34c 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/VitalitySpores.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Ranger/VitalitySpores.java
@@ -38,7 +38,7 @@ public class VitalitySpores extends Skill
 	@EventHandler
 	public void playerMove(PlayerMoveEvent event)
 	{
-		if (UtilMath.offset(event.getFrom(), event.getTo()) > 0)
+		if (doesUserHaveSkill(event.getPlayer()) && UtilMath.offset(event.getFrom(), event.getTo()) > 0)
 			_lastMove.put(event.getPlayer(), System.currentTimeMillis());
 	}
 	
@@ -71,6 +71,6 @@ public class VitalitySpores extends Skill
 	@Override
 	public void Reset(Player player) 
 	{
-
+		_lastMove.remove(player);
 	}
 }
diff --git a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
index bfed3327b..aba4aa1d7 100644
--- a/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
+++ b/Plugins/Mineplex.Minecraft.Game.ClassCombat/src/mineplex/minecraft/game/classcombat/Skill/Skill.java
@@ -257,6 +257,11 @@ public abstract class Skill implements ISkill, Listener
 		return null;
 	}
 
+	protected boolean doesUserHaveSkill(Player player)
+	{
+		return _users.containsKey(player);
+	}
+	
 	@Override
 	public Set<Player> GetUsers()
 	{