=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/DefaultObjectFilterService.java' --- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/DefaultObjectFilterService.java 2014-06-20 11:14:18 +0000 +++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/objectfilter/DefaultObjectFilterService.java 2014-07-04 03:18:31 +0000 @@ -76,9 +76,14 @@ return list; } - @SuppressWarnings( "unchecked" ) + @SuppressWarnings("unchecked") private boolean evaluateWithFilters( T object, Filters filters ) { + if ( object == null ) + { + return false; + } + Schema schema = schemaService.getDynamicSchema( object.getClass() ); for ( String field : filters.getFilters().keySet() )