diff --git a/src/main/java/world/bentobox/bentobox/database/objects/Players.java b/src/main/java/world/bentobox/bentobox/database/objects/Players.java
index e7fb05b1c..75c4b8ca7 100644
--- a/src/main/java/world/bentobox/bentobox/database/objects/Players.java
+++ b/src/main/java/world/bentobox/bentobox/database/objects/Players.java
@@ -205,7 +205,7 @@ public class Players implements DataObject {
      * @param world - world
      */
     public void clearHomeLocations(World world) {
-        homeLocations.keySet().removeIf(l -> l == null || Util.sameWorld(l.getWorld(), world));
+        homeLocations.keySet().removeIf(l -> l == null || l.getWorld() == null || Util.sameWorld(l.getWorld(), world));
     }
 
     /**