From 0ddd645b7e53c6f3c086aa8364d55398e33c03f9 Mon Sep 17 00:00:00 2001
From: Treeku <treeku@gmx.com>
Date: Tue, 13 May 2014 02:56:34 +0100
Subject: [PATCH] Fixed bounty hunter null exception

---
 src/services/ConnectionService.java | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/services/ConnectionService.java b/src/services/ConnectionService.java
index 73102790..92841d3a 100644
--- a/src/services/ConnectionService.java
+++ b/src/services/ConnectionService.java
@@ -272,7 +272,9 @@ public class ConnectionService implements INetworkDispatch {
 			}
 		}*/
 		
-		core.missionService.getBountyMap().remove(core.getBountiesODB().get(object.getObjectID()));
+		if (core.getBountiesODB().contains(object.getObjectID())) {
+			core.missionService.getBountyMap().remove(core.getBountiesODB().get(object.getObjectID()));
+		}
 		
 		ghost.toggleFlag(PlayerFlags.LD);