diff --git a/api/src/main/java/net/jitse/npclib/listeners/PeriodicMoveListener.java b/api/src/main/java/net/jitse/npclib/listeners/PeriodicMoveListener.java
index 66623e8..2f99bbd 100644
--- a/api/src/main/java/net/jitse/npclib/listeners/PeriodicMoveListener.java
+++ b/api/src/main/java/net/jitse/npclib/listeners/PeriodicMoveListener.java
@@ -42,7 +42,10 @@ public class PeriodicMoveListener extends HandleMoveBase implements Listener {
 
 	@EventHandler
 	public void onPlayerQuit(PlayerQuitEvent evt) {
-		tasks.remove(evt.getPlayer().getUniqueId()).cancel();
+		BukkitTask task = tasks.remove(evt.getPlayer().getUniqueId());
+		if (task != null) {
+			task.cancel();
+		}
 	}
 
 }