From 0ce07ad4b49df61fac15278c2511748d3031244e Mon Sep 17 00:00:00 2001
From: Xephi59 <xephirot59@gmail.com>
Date: Sun, 12 Jul 2015 22:39:14 +0200
Subject: [PATCH] NPE ? :O

---
 .../java/fr/xephi/authme/listener/AuthMePlayerListener.java     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java b/src/main/java/fr/xephi/authme/listener/AuthMePlayerListener.java
index ac1551de8..959830875 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);
         }