diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitCore.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitCore.java
index 51a7f9d1..44718232 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitCore.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/BukkitCore.java
@@ -46,7 +46,9 @@ public class BukkitCore extends FastLoginCore {
         YamlConfiguration messageConfig = YamlConfiguration.loadConfiguration(messageFile);
         for (String key : messageConfig.getKeys(false)) {
             String message = ChatColor.translateAlternateColorCodes('&', messageConfig.getString(key));
-            localeMessages.put(key, message);
+            if (!message.isEmpty()) {
+                localeMessages.put(key, message);
+            }
         }
     }
 
diff --git a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java
index 23ec60a5..77280001 100644
--- a/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java
+++ b/bukkit/src/main/java/com/github/games647/fastlogin/bukkit/tasks/ForceLoginTask.java
@@ -86,7 +86,12 @@ public class ForceLoginTask implements Runnable {
 
         String generatedPassword = plugin.generateStringPassword(player);
         boolean success = authPlugin.forceRegister(player, generatedPassword);
-        player.sendMessage(plugin.getCore().getMessage("auto-register").replace("%password", generatedPassword));
+        String message = plugin.getCore().getMessage("auto-register");
+        if (message != null) {
+            message = message.replace("%password", generatedPassword);
+        }
+
+        player.sendMessage(message);
         return success;
     }
 
diff --git a/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeCore.java b/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeCore.java
index 492d79aa..40692e56 100644
--- a/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeCore.java
+++ b/bungee/src/main/java/com/github/games647/fastlogin/bungee/BungeeCore.java
@@ -54,7 +54,9 @@ public class BungeeCore extends FastLoginCore {
             Configuration messageConfig = ConfigurationProvider.getProvider(YamlConfiguration.class).load(messageFile);
             for (String key : messageConfig.getKeys()) {
                 String message = ChatColor.translateAlternateColorCodes('&', messageConfig.getString(key));
-                localeMessages.put(key, message);
+                if (!message.isEmpty()) {
+                    localeMessages.put(key, message);
+                }
             }
         } catch (IOException ex) {
             getLogger().log(Level.SEVERE, "Failed to load messages", ex);