From 1f3e52a4b9f7172b9dfd94aed15778259083339b Mon Sep 17 00:00:00 2001
From: KHobbits <rob@khobbits.co.uk>
Date: Mon, 15 Jul 2013 00:47:17 +0100
Subject: Better handle esschat/GM reloading during async events.

---
 .../src/com/earth2me/essentials/perm/GroupManagerHandler.java    | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java b/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java
index 23fe142b2..83dd1a846 100644
--- a/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java
+++ b/Essentials/src/com/earth2me/essentials/perm/GroupManagerHandler.java
@@ -102,6 +102,13 @@ public class GroupManagerHandler implements IPermissionsHandler
 		{
 			return null;
 		}
-		return holder.getWorldPermissions(base);
+		try
+		{
+			return holder.getWorldPermissions(base);
+		}
+		catch (NullPointerException ex)
+		{
+			return null;
+		}
 	}
 }
-- 
cgit v1.2.3