=== modified file 'dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java'
--- dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java	2013-12-09 21:32:59 +0000
+++ dhis-2/dhis-web/dhis-web-commons/src/main/java/org/hisp/dhis/commons/action/GetOrganisationUnitTreeAction.java	2013-12-18 08:58:19 +0000
@@ -236,7 +236,13 @@
                 }
 
                 int minLevel = rootOrganisationUnits.get( 0 ).getLevel();
-                int maxLevel = organisationUnitService.getOrganisationUnitLevelByLevel( size ).getLevel();
+                int maxLevel = Integer.MAX_VALUE;
+
+                if ( organisationUnitService.getOrganisationUnitLevelByLevel( size ) != null )
+                {
+                    maxLevel = organisationUnitService.getOrganisationUnitLevelByLevel( size ).getLevel();
+                }
+
                 int total = minLevel + offlineOrganisationUnitLevel.getLevel() - 1;
 
                 if ( total > offlineOrganisationUnitLevel.getLevel() )