=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2014-04-07 10:35:04 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/event/data/DefaultEventAnalyticsService.java 2014-04-10 23:45:13 +0000 @@ -359,10 +359,13 @@ } } - for ( NameableObject object : params.getDimensionOrFilter( ORGUNIT_DIM_ID ) ) + if ( params.hasDimensionOrFilter( ORGUNIT_DIM_ID ) ) { - OrganisationUnit unit = (OrganisationUnit) object; - unit.setLevel( organisationUnitService.getLevelOfOrganisationUnit( unit.getUid() ) ); + for ( NameableObject object : params.getDimensionOrFilter( ORGUNIT_DIM_ID ) ) + { + OrganisationUnit unit = (OrganisationUnit) object; + unit.setLevel( organisationUnitService.getLevelOfOrganisationUnit( unit.getUid() ) ); + } } if ( asc != null )