--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2016/02/13 07:05:11	2942
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/AddressSearch.java	2016/02/13 07:24:34	2943
@@ -58,7 +58,7 @@
 		this.db = db;
 		this.config = config;
 		
-		levenshteinHelper = new LevenshteinStreetnameHelper( this );
+		levenshteinHelper = new LevenshteinStreetnameHelper();
 		metaphoneHelper = new DoubleMetaphoneStreetnameHelper(config);
 		googleHelper = new GoogleStreetnameHelper( config );
 		osmHelper = new OSMStreetnameHelper( config );
@@ -476,7 +476,7 @@
 
 			boolean covered = false;
 			if (targetAddress.distributor.equals("DAO")) {
-				orgAddress.ruteMandag = calculateExtendedDaoRoute(eb,orgAddress,targetAddress);	
+				orgAddress.ruteMandag = calculateExtendedDaoRoute(eb, targetAddress);	
 				orgAddress.ruteMandag = ruteHelper.getInstance(orgAddress.ruteMandag);
 				
 				if (orgAddress.ruteMandag != null) {
@@ -486,7 +486,7 @@
 			}
 			
 			if (targetAddress.distributor.equals("BK")) {
-				orgAddress.korelisteMandag = calculateExtendedBkKoreliste(eb,orgAddress,targetAddress);
+				orgAddress.korelisteMandag = calculateExtendedBkKoreliste(eb, targetAddress);
 				orgAddress.korelisteMandag = korelisteHelper.getInstance(orgAddress.korelisteMandag);
 				
 				if (orgAddress.korelisteMandag != null) {
@@ -601,7 +601,7 @@
 	}
 	
 	
-	private String calculateExtendedDaoRoute(ExtendedBean eb, Address orgAddress, Address targetAddress) {
+	private String calculateExtendedDaoRoute(ExtendedBean eb, Address targetAddress) {
 		if (targetAddress.ruteMandag == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel
 			return null;
 		}
@@ -656,7 +656,11 @@
 	}
 	
 	///////////////////////////////////////////////////////////
-	private String calculateExtendedBkKoreliste(ExtendedBean eb, Address orgAddress, Address targetAddress) {
+	private String calculateExtendedBkKoreliste(ExtendedBean eb, Address targetAddress) {
+		if (targetAddress.ruteMandag == null) { //hvis targetAdress.rute er null så er adressen ikke dækket alligevel
+			return null;
+		}
+		
 		String inject;
 		if (eb.afstand <= 0.500) {
 			inject = ".";