=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java	2015-10-01 11:35:44 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java	2015-10-01 13:06:22 +0000
@@ -1093,7 +1093,7 @@
         
         if ( event.getAttributeCategoryOptions() != null && program.getCategoryCombo() != null )
         {
-            coc = inputUtils.getAttributeOptionCombo( program.getCategoryCombo(), event.getAttributeCategoryOptions() ); //getAttributeOptionCombo( program.getCategoryCombo(), event.getAttributeCategoryOptions() );
+            coc = inputUtils.getAttributeOptionCombo( program.getCategoryCombo(), event.getAttributeCategoryOptions() );
             
             if ( coc == null)
             {

=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/InputUtils.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/InputUtils.java	2015-10-01 11:44:04 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/utils/InputUtils.java	2015-10-01 13:06:22 +0000
@@ -80,6 +80,11 @@
         {
             throw new IllegalQueryException( "Illegal category combo identifier: " + cc );
         }
+        
+        if ( categoryCombo == null && opts == null )
+        {
+            categoryCombo = categoryService.getDefaultDataElementCategoryCombo();
+        }
 
         return getAttributeOptionCombo( categoryCombo, cp );
     }