=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/Preheat.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/Preheat.java	2016-03-03 03:10:04 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/preheat/Preheat.java	2016-03-08 05:30:26 +0000
@@ -250,8 +250,13 @@
 
     public static boolean isDefaultClass( IdentifiableObject object )
     {
-        return (DataElementCategory.class.isInstance( object ) || DataElementCategoryOption.class.isInstance( object )
-            || DataElementCategoryCombo.class.isInstance( object ));
+        return object != null && isDefaultClass( object.getClass() );
+    }
+
+    public static boolean isDefaultClass( Class<?> klass )
+    {
+        return (DataElementCategory.class.isAssignableFrom( klass ) || DataElementCategoryOption.class.isInstance( klass )
+            || DataElementCategoryCombo.class.isInstance( klass ));
     }
 
     public static boolean isDefault( IdentifiableObject object )