=== modified file 'dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportController.java'
--- dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportController.java	2013-04-30 11:27:03 +0000
+++ dhis-2/dhis-web/dhis-web-api/src/main/java/org/hisp/dhis/api/controller/ReportController.java	2013-06-09 21:26:26 +0000
@@ -175,6 +175,12 @@
     {
         Report report = reportService.getReport( uid );
 
+        if ( report == null )
+        {
+            ContextUtils.notFoundResponse( response, "Report does not exist: " + uid );
+            return null;
+        }
+        
         if ( organisationUnitUid == null && report.hasReportTable() && report.getReportTable().hasReportParams()
             && report.getReportTable().getReportParams().isOrganisationUnitSet() )
         {