diff --git a/core/src/main/java/io/github/dre2n/dungeonsxl/config/WorldConfig.java b/core/src/main/java/io/github/dre2n/dungeonsxl/config/WorldConfig.java
index 5ec33a7d..ee588409 100644
--- a/core/src/main/java/io/github/dre2n/dungeonsxl/config/WorldConfig.java
+++ b/core/src/main/java/io/github/dre2n/dungeonsxl/config/WorldConfig.java
@@ -302,8 +302,10 @@ public class WorldConfig extends GameRules {
         FileConfiguration configFile = YamlConfiguration.loadConfiguration(file);
 
         // Messages
-        for (int msgs : this.msgs.keySet()) {
-            configFile.set("message." + msgs, this.msgs.get(msgs));
+        if (msgs != null) {
+            for (int msgs : this.msgs.keySet()) {
+                configFile.set("message." + msgs, this.msgs.get(msgs));
+            }
         }
 
         List<String> secureObjectIds = new ArrayList<>();