=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java	2014-03-28 03:17:47 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/schema/DefaultSchemaService.java	2014-03-28 03:28:21 +0000
@@ -83,12 +83,17 @@
         }
         */
 
-        if ( !classSchemaMap.containsKey( klass ) && classSchemaMap.containsKey( klass.getSuperclass() ) )
+        if ( classSchemaMap.containsKey( klass ) )
+        {
+            return classSchemaMap.get( klass );
+        }
+
+        if ( classSchemaMap.containsKey( klass.getSuperclass() ) )
         {
             return classSchemaMap.get( klass.getSuperclass() );
         }
 
-        return classSchemaMap.get( klass );
+        return null;
     }
 
     @Override