=== modified file 'dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportUtils.java'
--- dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportUtils.java	2012-06-10 16:05:59 +0000
+++ dhis-2/dhis-dxf2/src/main/java/org/hisp/dhis/dxf2/metadata/ImportUtils.java	2013-04-08 13:14:42 +0000
@@ -52,11 +52,11 @@
             {
                 return identifiableObject.getName();
             }
-            else if ( identifiableObject.getUid() != null && identifiableObject.getName().length() > 0 )
+            else if ( identifiableObject.getUid() != null && identifiableObject.getUid().length() > 0 )
             {
                 return identifiableObject.getUid();
             }
-            else if ( identifiableObject.getCode() != null && identifiableObject.getName().length() > 0 )
+            else if ( identifiableObject.getCode() != null && identifiableObject.getCode().length() > 0 )
             {
                 return identifiableObject.getCode();
             }