From e71a2d2e48f8fc07eae6450153e1f3fe71f8a9f1 Mon Sep 17 00:00:00 2001
From: NewGarbo <newgarboreal@gmail.com>
Date: Sat, 16 Jan 2016 08:20:11 +0000
Subject: [PATCH] quick npe fix

---
 .../src/mineplex/game/clans/clans/siege/cannon/Cannon.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/cannon/Cannon.java b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/cannon/Cannon.java
index b021831d9..d3b34ccca 100644
--- a/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/cannon/Cannon.java
+++ b/Plugins/Mineplex.Game.Clans/src/mineplex/game/clans/clans/siege/cannon/Cannon.java
@@ -52,9 +52,9 @@ public class Cannon implements Listener
 	
 	public void cleanup()
 	{
-		_armorStand.remove();
-		_filler.remove();
-		_filler2.remove();
+		if (_armorStand != null) _armorStand.remove();
+		if (_filler != null) _filler.remove();
+		if (_filler2 != null) _filler2.remove();
 		HandlerList.unregisterAll(this);
 	}