diff --git a/pom.xml b/pom.xml
index 37dbe41..a4f2b8b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,7 +17,7 @@
 
 	<properties>
 		<!-- project version -->
-		<revision>0.8.0</revision>
+		<revision>0.8.1</revision>
 		<changelist>-SNAPSHOT</changelist>
 	</properties>
 
diff --git a/src/main/java/nl/svenar/powercamera/tracker/PlayerCameraDataTracker.java b/src/main/java/nl/svenar/powercamera/tracker/PlayerCameraDataTracker.java
index 61ebe27..4fd2d15 100644
--- a/src/main/java/nl/svenar/powercamera/tracker/PlayerCameraDataTracker.java
+++ b/src/main/java/nl/svenar/powercamera/tracker/PlayerCameraDataTracker.java
@@ -1,5 +1,6 @@
 package nl.svenar.powercamera.tracker;
 
+import nl.svenar.powercamera.CameraHandler;
 import nl.svenar.powercamera.data.PlayerCameraData;
 import org.bukkit.entity.Player;
 
@@ -25,6 +26,9 @@ public void handlePlayerJoin(Player player) {
     }
 
     public void handlePlayerQuit(Player player) {
-        cameraDataMap.remove(player.getUniqueId()).getCameraHandler().cancel();
+        final CameraHandler cameraHandler = cameraDataMap.remove(player.getUniqueId()).getCameraHandler();
+        if (cameraHandler != null) {
+            cameraHandler.cancel();
+        }
     }
 }