=== modified file 'dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java'
--- dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java	2016-01-04 02:27:49 +0000
+++ dhis-2/dhis-api/src/main/java/org/hisp/dhis/dataelement/DataElementCategoryCombo.java	2016-01-06 12:12:21 +0000
@@ -111,7 +111,7 @@
      */
     public boolean isValid()
     {
-        if ( categories == null || categories.isEmpty() || optionCombos == null || optionCombos.isEmpty() )
+        if ( categories == null || categories.isEmpty() )
         {
             return false;
         }