=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java	2012-06-20 19:38:02 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/organisationunit/DefaultOrganisationUnitService.java	2012-06-20 19:39:28 +0000
@@ -96,6 +96,8 @@
     @Override
     public int addOrganisationUnit( OrganisationUnit organisationUnit )
     {
+        int id = organisationUnitStore.save( organisationUnit );
+
         if(organisationUnit.getParent() == null)
         {
             // we are adding a new root node, add this node to the current user
@@ -103,8 +105,6 @@
             currentUserService.getCurrentUser().getOrganisationUnits().add( organisationUnit );
         }
 
-        int id = organisationUnitStore.save( organisationUnit );
-
         log.info( AuditLogUtil.logMessage( currentUserService.getCurrentUsername(), AuditLogUtil.ACTION_ADD,
             OrganisationUnit.class.getSimpleName(), organisationUnit.getName() ) );