=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java	2016-02-29 04:45:21 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/preheat/DefaultPreheatService.java	2016-02-29 05:37:22 +0000
@@ -304,14 +304,14 @@
                         }
                     } );
 
+                    if ( !StringUtils.isEmpty( object.getUid() ) ) uidMap.get( objectClass ).add( object.getUid() );
+                    if ( !StringUtils.isEmpty( object.getCode() ) ) codeMap.get( objectClass ).add( object.getCode() );
+
                     if ( uidMap.get( Attribute.class ).isEmpty() ) uidMap.remove( Attribute.class );
                     if ( codeMap.get( Attribute.class ).isEmpty() ) codeMap.remove( Attribute.class );
 
                     if ( uidMap.get( UserGroup.class ).isEmpty() ) uidMap.remove( UserGroup.class );
                     if ( codeMap.get( UserGroup.class ).isEmpty() ) codeMap.remove( UserGroup.class );
-
-                    if ( !StringUtils.isEmpty( object.getUid() ) ) uidMap.get( objectClass ).add( object.getUid() );
-                    if ( !StringUtils.isEmpty( object.getCode() ) ) codeMap.get( objectClass ).add( object.getCode() );
                 }
             } );
         }