From 5f63d829e4c093f1242111f2e8de221810293295 Mon Sep 17 00:00:00 2001
From: Olof Larsson <olof@sylt.nu>
Date: Fri, 5 Dec 2014 00:36:17 +0100
Subject: [PATCH] Avoid NPE on trying to delete non existant entity. Fixes
 MassiveCraft/Factions#722.

---
 src/main/java/com/massivecraft/massivecore/store/Coll.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/massivecraft/massivecore/store/Coll.java b/src/main/java/com/massivecraft/massivecore/store/Coll.java
index 6fa5d06d..5c8cfc2e 100644
--- a/src/main/java/com/massivecraft/massivecore/store/Coll.java
+++ b/src/main/java/com/massivecraft/massivecore/store/Coll.java
@@ -373,7 +373,9 @@ public class Coll<E> implements CollInterface<E>
 		if (oid == null) throw new NullPointerException("oid");
 		
 		String id = this.fixId(oid);
-		E e = this.get(id);
+		E e = this.get(id, false);
+		if (e == null) return null;
+		
 		this.detach(e, id);
 		return e;
 	}