=== 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-11-19 16:59:04 +0000 +++ dhis-2/dhis-web/dhis-web-api-fred/src/main/java/org/hisp/dhis/web/webapi/v1/controller/FacilityController.java 2013-11-19 20:03:19 +0000 @@ -318,6 +318,11 @@ offset = 0; } + if ( limitValue == null ) + { + limitValue = allOrganisationUnits.size(); + } + if ( offset > allOrganisationUnits.size() ) { offset = allOrganisationUnits.size();