=== modified file 'dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java'
--- dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java	2013-08-23 16:05:01 +0000
+++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java	2013-11-01 08:52:57 +0000
@@ -336,7 +336,7 @@
 
             facilities.getFacilities().add( facility );
 
-            if ( request.getRequestURL().toString().endsWith( ".json" ) )
+            if ( request.getRequestURL().toString().endsWith( ".json" ) && facility.getHref() != null )
             {
                 facility.setHref( facility.getHref() + ".json" );
             }