=== modified file 'dhis-2/dhis-web/dhis-web-pivot/src/main/java/org/hisp/dhis/pivot/action/GetOrganisationUnitChildrenAction.java' --- dhis-2/dhis-web/dhis-web-pivot/src/main/java/org/hisp/dhis/pivot/action/GetOrganisationUnitChildrenAction.java 2013-01-17 16:06:38 +0000 +++ dhis-2/dhis-web/dhis-web-pivot/src/main/java/org/hisp/dhis/pivot/action/GetOrganisationUnitChildrenAction.java 2013-04-16 18:22:00 +0000 @@ -86,10 +86,10 @@ { OrganisationUnit unit = organisationUnitService.getOrganisationUnit( node ); - int level = organisationUnitService.getLevelOfOrganisationUnit( unit.getId() ) + 1; - if ( unit != null ) { + int level = organisationUnitService.getLevelOfOrganisationUnit( unit.getId() ) + 1; + units = new ArrayList( unit.getChildren() ); for ( OrganisationUnit organisationUnit : units )