=== modified file 'dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java' --- dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java 2014-08-15 07:40:20 +0000 +++ dhis-2/dhis-services/dhis-service-analytics/src/main/java/org/hisp/dhis/analytics/table/AbstractJdbcTableManager.java 2014-08-27 11:16:41 +0000 @@ -129,8 +129,8 @@ Date latest = getLatestData(); - earliest = earliest.before( MIN_EARLIEST_DATE ) ? MIN_EARLIEST_DATE : earliest; - latest = latest.after( MAX_LATEST_DATE ) ? MAX_LATEST_DATE : latest; + earliest = earliest != null && earliest.before( MIN_EARLIEST_DATE ) ? MIN_EARLIEST_DATE : earliest; + latest = latest != null && latest.after( MAX_LATEST_DATE ) ? MAX_LATEST_DATE : latest; return getTables( earliest, latest ); }