=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/Jackson2PropertyIntrospectorService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/Jackson2PropertyIntrospectorService.java	2014-11-18 13:45:13 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/Jackson2PropertyIntrospectorService.java	2014-11-19 06:25:55 +0000
@@ -118,7 +118,7 @@
             }
 
             // This will be replaced later and fetched from hibernate mapping files instead
-            if ( property.isPersisted() && ("name".equals( fieldName ) || "code".equals( fieldName )) )
+            if ( property.isPersisted() && ("name".equals( fieldName ) || "code".equals( fieldName )) && IdentifiableObject.class.isAssignableFrom( clazz ) )
             {
                 IdentifiableObject identifiableObject;