diff --git a/src/main/java/net/citizensnpcs/trait/CurrentLocation.java b/src/main/java/net/citizensnpcs/trait/CurrentLocation.java
index 521b9f2de..290d1b35b 100644
--- a/src/main/java/net/citizensnpcs/trait/CurrentLocation.java
+++ b/src/main/java/net/citizensnpcs/trait/CurrentLocation.java
@@ -14,6 +14,8 @@ public class CurrentLocation extends Trait {
     }
 
     public Location getLocation() {
+        if (loc.getWorld() == null)
+            return null;
         return loc;
     }