=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java	2014-04-28 15:43:02 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/dataelement/DefaultDataElementCategoryService.java	2014-06-16 10:45:17 +0000
@@ -639,7 +639,7 @@
 
         for ( DataElement dataElement : dataElements )
         {
-            if ( dataElement.getCategoryCombo() != null )
+            if ( dataElement != null && dataElement.getCategoryCombo() != null )
             {
                 if ( !dataElement.getCategoryCombo().isDefault() && includeTotals )
                 {
@@ -675,7 +675,7 @@
 
         for ( DataElement dataElement : dataElements )
         {
-            if ( dataElement.getCategoryCombo() != null )
+            if ( dataElement != null && dataElement.getCategoryCombo() != null )
             {
                 for ( DataElementCategoryOptionCombo categoryOptionCombo : dataElement.getCategoryCombo().getOptionCombos() )
                 {