--- dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/SearchServlet.java	2015/03/31 13:43:14	2505
+++ dao/DaoAdresseService/src/main/java/dk/daoas/daoadresseservice/SearchServlet.java	2015/04/08 10:06:14	2506
@@ -8,6 +8,8 @@
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
+import org.apache.commons.lang3.StringUtils;
+
 import dk.daoas.daoadresseservice.admin.ServiceConfig;
 import dk.daoas.daoadresseservice.beans.Address;
 import dk.daoas.daoadresseservice.beans.SearchResult;
@@ -89,10 +91,13 @@
 		} else {
 			sb.append("<status>error</status>");
 		}
+		
+		String rute = StringUtils.defaultString(result.address.rute); //Sikre at der ikke sendes "null" tilbage
+		String koreliste = StringUtils.defaultString(result.address.koreliste); //Sikre at der ikke sendes "null" tilbage
 			
 		sb.append("<error>").append( result.status ).append("</error>");
-		sb.append("<distrikt>").append(result.address.rute).append("</distrikt>");
-		sb.append("<koreliste>").append(result.address.koreliste).append("</koreliste>");
+		sb.append("<distrikt>").append( rute ).append("</distrikt>");
+		sb.append("<koreliste>").append( koreliste ).append("</koreliste>");
 		sb.append("<kommunekode>").append(result.address.kommunekode).append("</kommunekode>");
 		sb.append("<vejkode>").append(result.address.vejkode).append("</vejkode>");
 		sb.append("<dbkbane>").append(result.address.dbkBane).append("</dbkbane>");