=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java'
--- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java	2015-09-08 18:09:34 +0000
+++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/EventQueryParams.java	2015-09-09 10:58:52 +0000
@@ -317,7 +317,7 @@
         {
             return aggregationType;
         }
-        else if ( hasValueDimension() )
+        else if ( hasValueDimension() && value.getAggregationType() != null )
         {
             return value.getAggregationType();
         }