diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index ac1551de..95983087 100644
--- a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
+++ b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
@@ -559,7 +559,7 @@ public class AuthMePlayerListener implements Listener {
         plugin.management.performJoin(player);
 
         // Remove the join message while the player isn't logging in
-        if (Settings.enableProtection || Settings.delayJoinMessage) {
+        if ((Settings.enableProtection || Settings.delayJoinMessage) && name != null && event.getJoinMessage() != null) {
             joinMessage.put(name, event.getJoinMessage());
             event.setJoinMessage(null);
         }