diff --git a/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java b/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java
index 3d32b95..2e67d54 100644
--- a/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java
+++ b/src/main/java/world/bentobox/warps/managers/WarpSignsManager.java
@@ -199,15 +199,15 @@ public class WarpSignsManager {
             warpsData = handler.loadObject(WARPS);
             // Load into map
             if (warpsData != null) {
-                warpsData.getWarpSigns().forEach((k,v) -> {
-                    if (k != null && k.getWorld() != null) {
-                        if (k.getWorld().isChunkLoaded(k.getBlockX() >> 4, k.getBlockZ() >> 4)
-                                && !k.getBlock().getType().name().contains("SIGN")) {
+                warpsData.getWarpSigns().forEach((location,uuid) -> {
+                    if (location != null && location.getWorld() != null) {
+                        if (location.getWorld().isChunkLoaded(location.getBlockX() >> 4, location.getBlockZ() >> 4)
+                                && !location.getBlock().getType().name().contains("SIGN")) {
                             return;
                         }
 
                         // Add to map
-                        getWarpMap(k.getWorld()).put(v, k);
+                        getWarpMap(location.getWorld()).put(uuid, location);
                     }
                 });
             } else {