=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java	2015-02-24 10:40:21 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/common/DefaultIdentifiableObjectManager.java	2015-03-03 09:18:26 +0000
@@ -781,12 +781,9 @@
             {
                 return store.getByUid( id );
             }
-            else if ( IdentifiableProperty.UUID.equals( property ) )
+            else if ( IdentifiableProperty.UUID.equals( property ) && OrganisationUnit.class.isAssignableFrom( clazz ) )
             {
-                if ( OrganisationUnit.class.isAssignableFrom( clazz ) )
-                {
-                    return (T) organisationUnitService.getOrganisationUnitByUuid( id );
-                }
+                return (T) organisationUnitService.getOrganisationUnitByUuid( id );
             }
             else if ( IdentifiableProperty.CODE.equals( property ) )
             {