diff --git a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
index a32c4b2..2efde08 100644
--- a/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
+++ b/src/me/ryanhamshire/GriefPrevention/EntityEventHandler.java
@@ -568,6 +568,9 @@ class EntityEventHandler implements Listener
 		//all of this is anti theft code
 		if(!GriefPrevention.instance.config_claims_preventTheft) return;	
 		
+		//input validation
+		if(event.getVehicle() == null) return;
+		
 		//don't track in worlds where claims are not enabled
         if(!GriefPrevention.instance.claimsEnabledForWorld(event.getVehicle().getWorld())) return;