--- dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/LookupWorker.java	2015/09/28 11:09:33	2718
+++ dao/FuldDaekningWorker/src/dk/daoas/fulddaekning/LookupWorker.java	2015/09/28 13:32:19	2719
@@ -3,6 +3,7 @@
 import java.sql.SQLException;
 import java.util.Collection;
 import java.util.Map;
+import java.util.NoSuchElementException;
 import java.util.Queue;
 import java.util.concurrent.BrokenBarrierException;
 import java.util.concurrent.CyclicBarrier;
@@ -62,7 +63,13 @@
 
 		while ( ! ikkeDaekkede.isEmpty() ) {
 			
-			Adresse qAdresse = ikkeDaekkede.remove();
+			Adresse qAdresse = null;
+			try {
+				qAdresse = ikkeDaekkede.remove();
+			} catch (NoSuchElementException e) {
+				logger.info( "Worker/" + workerID + " NoSuchElementException");
+				break;
+			}
 
 			short ho = qAdresse.ho;
 			KdTree<Adresse> addressTree = hoTrees.get(ho);
@@ -116,7 +123,7 @@
 			logger.log(Level.SEVERE, e.getMessage(), e);
 			System.exit(-1);
 		} catch(InterruptedException e) {
-			//Do nothing
+			logger.log(Level.SEVERE, e.getMessage(), e);
 		}