--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java	2014/09/11 15:07:01	2204
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/Lookup.java	2014/09/11 15:09:03	2205
@@ -128,7 +128,12 @@
 	
 	public void shutdownWorker(int workerid) {
 		logger.info("Shutting down worker: " + workerid);
-		workers.remove(workerid);
+		LookupWorker key = workers.remove(workerid);
+		
+		if (key == null) {
+			System.out.println("Error removing worker from set");
+			System.exit(0);
+		}
 	}
 	
 	// Getters and setters