diff --git a/src/main/java/dev/ninesliced/providers/PlayerRadarProvider.java b/src/main/java/dev/ninesliced/providers/PlayerRadarProvider.java
index 09ce4a1..8f0b91d 100644
--- a/src/main/java/dev/ninesliced/providers/PlayerRadarProvider.java
+++ b/src/main/java/dev/ninesliced/providers/PlayerRadarProvider.java
@@ -49,11 +49,13 @@ public void update(World world, Player viewingPlayer, MarkersCollector collector
                 return;
             }
 
-            if (viewerUuid != null) {
-                PlayerConfig playerConfig = PlayerConfigManager.getInstance().getPlayerConfig(viewerUuid);
-                if (playerConfig != null && playerConfig.isHidePlayersOnMap()) {
-                    return;
-                }
+            if (viewerUuid == null) {
+                return;
+            }
+
+            PlayerConfig playerConfig = PlayerConfigManager.getInstance().getPlayerConfig(viewerUuid);
+            if (playerConfig != null && playerConfig.isHidePlayersOnMap()) {
+                return;
             }
 
             List<RadarData> radarDataList = PlayerRadarManager.getInstance().getRadarData(world.getName());
diff --git a/src/main/java/dev/ninesliced/providers/UserMarkerContextMenuProvider.java b/src/main/java/dev/ninesliced/providers/UserMarkerContextMenuProvider.java
index 1e45290..d6e4a12 100644
--- a/src/main/java/dev/ninesliced/providers/UserMarkerContextMenuProvider.java
+++ b/src/main/java/dev/ninesliced/providers/UserMarkerContextMenuProvider.java
@@ -77,15 +77,22 @@ public void update(@Nonnull World world, @Nonnull Player player, @Nonnull Marker
 
         if (!hidePersonalWaypoints) {
             PlayerWorldData perWorldData = player.getPlayerConfigData().getPerWorldData(world.getName());
-            for (UserMapMarker marker : perWorldData.getUserMapMarkers()) {
-                collector.add(buildMarkerWithContextMenu(marker, showTeleport));
+            if (perWorldData != null) {
+                Iterable<? extends UserMapMarker> userMapMarkers = perWorldData.getUserMapMarkers();
+                if (userMapMarkers != null) {
+                    for (UserMapMarker marker : userMapMarkers) {
+                        collector.add(buildMarkerWithContextMenu(marker, showTeleport));
+                    }
+                }
             }
         }
         
         if (!hideGlobalWaypoints) {
             WorldMarkersResource worldMarkersResource = world.getChunkStore().getStore().getResource(WorldMarkersResource.getResourceType());
-            for (UserMapMarker marker : worldMarkersResource.getUserMapMarkers()) {
-                collector.add(buildMarkerWithContextMenu(marker, showTeleport));
+            if (worldMarkersResource != null && worldMarkersResource.getUserMapMarkers() != null) {
+                for (UserMapMarker marker : worldMarkersResource.getUserMapMarkers()) {
+                    collector.add(buildMarkerWithContextMenu(marker, showTeleport));
+                }
             }
         }
     }