=== modified file 'dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/RemoveEmptyEventsAction.java'
--- dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/RemoveEmptyEventsAction.java	2012-11-07 15:43:51 +0000
+++ dhis-2/dhis-web/dhis-web-caseentry/src/main/java/org/hisp/dhis/caseentry/action/caseentry/RemoveEmptyEventsAction.java	2013-04-16 09:09:37 +0000
@@ -37,7 +37,6 @@
 
 /**
  * @author Chau Thu Tran
- * 
  * @version RemoveEmptyEventsAction.java Jul 3, 2012 $
  */
 public class RemoveEmptyEventsAction
@@ -86,8 +85,13 @@
     public String execute()
         throws Exception
     {
+        if ( programStageId == null )
+        {
+            return INPUT;
+        }
+
         ProgramStage programStage = programStageService.getProgramStage( programStageId );
-        
+
         OrganisationUnit organisationUnit = selectionManager.getSelectedOrganisationUnit();
 
         programStageInstanceService.removeEmptyEvents( programStage, organisationUnit );