=== modified file 'dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetOrganisationUnitsAction.java'
--- dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetOrganisationUnitsAction.java	2011-09-23 13:11:20 +0000
+++ dhis-2/dhis-web/dhis-web-light/src/main/java/org/hisp/dhis/light/action/GetOrganisationUnitsAction.java	2011-09-27 07:39:54 +0000
@@ -33,6 +33,7 @@
 import org.hisp.dhis.organisationunit.OrganisationUnit;
 import org.hisp.dhis.organisationunit.OrganisationUnitService;
 import org.hisp.dhis.user.CurrentUserService;
+import org.hisp.dhis.user.User;
 
 import com.opensymphony.xwork2.Action;
 
@@ -78,17 +79,22 @@
     @Override
     public String execute()
     {
-        List<OrganisationUnit> userOrganisationUnits = new ArrayList<OrganisationUnit>( currentUserService
-            .getCurrentUser().getOrganisationUnits() );
-
-        for ( OrganisationUnit unit : userOrganisationUnits )
+        User user = currentUserService.getCurrentUser();
+        
+        if ( user != null )
         {
-            organisationUnits.addAll( organisationUnitService.getOrganisationUnitWithChildren( unit.getId() ) );
+            List<OrganisationUnit> userOrganisationUnits = new ArrayList<OrganisationUnit>( user.getOrganisationUnits() );
+    
+            for ( OrganisationUnit unit : userOrganisationUnits )
+            {
+                organisationUnits.addAll( organisationUnitService.getOrganisationUnitWithChildren( unit.getId() ) );
+            }
+    
+            // Collections.sort( organisationUnits, new OrganisationUnitNameComparator() );
+            
+            organisationUnits = organisationUnits.subList( 0, 50 );
         }
-
-//        Collections.sort( organisationUnits, new OrganisationUnitNameComparator() );
-        organisationUnits = organisationUnits.subList( 0, 50 );
-
+        
         return SUCCESS;
     }
 }