From a05fd2dd11f7b875c041fc0dad164ce2ac1ff81b Mon Sep 17 00:00:00 2001
From: MattBDev <mattbdev@outlook.com>
Date: Mon, 10 Oct 2016 00:18:35 -0400
Subject: [PATCH] Fix #1386

Signed-off-by: MattBDev <mattbdev@outlook.com>
---
 .../java/com/intellectualcrafters/plot/util/EventUtil.java   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java b/Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java
index 61371dc20..6e85915d1 100644
--- a/Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java
+++ b/Core/src/main/java/com/intellectualcrafters/plot/util/EventUtil.java
@@ -59,8 +59,11 @@ public abstract class EventUtil {
     public abstract void callMember(PlotPlayer initiator, Plot plot, UUID player, boolean added);
 
     public void doJoinTask(final PlotPlayer player) {
+        if (player == null) {
+            return; //possible future warning message to figure out where we are retrieving null
+        }
         if (ExpireManager.IMP != null) {
-            ExpireManager.IMP.handleJoin(player);
+                ExpireManager.IMP.handleJoin(player);
         }
         if (PS.get().worldedit != null) {
             if (player.getAttribute("worldedit")) {