=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java	2014-11-29 12:20:13 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/DefaultObjectBridge.java	2014-11-30 06:08:12 +0000
@@ -602,7 +602,7 @@
             map = codeMap.get( identifiableObject.getClass() );
         }
 
-        if ( !preheatCache && entity == null )
+        if ( !preheatCache && entity == null && identifiableObject.haveUniqueCode() )
         {
             entity = manager.getByCode( identifiableObject.getClass(), identifiableObject.getCode() );
 
@@ -630,7 +630,7 @@
             map = nameMap.get( identifiableObject.getClass() );
         }
 
-        if ( !preheatCache && identifiableObject.haveUniqueNames() && entity == null )
+        if ( !preheatCache && entity == null && identifiableObject.haveUniqueNames() )
         {
             entity = manager.getByName( identifiableObject.getClass(), identifiableObject.getName() );