=== modified file 'dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ProgramEnrollmentSelectAction.java'
--- dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ProgramEnrollmentSelectAction.java	2009-10-27 09:52:45 +0000
+++ dhis-2/dhis-web/dhis-web-maintenance/dhis-web-maintenance-patient/src/main/java/org/hisp/dhis/patient/action/patient/ProgramEnrollmentSelectAction.java	2009-11-24 11:23:48 +0000
@@ -107,12 +107,12 @@
     public Patient getPatient()
     {
         return patient;
-    }   
-   
+    }
+
     public void setPatient( Patient patient )
     {
         this.patient = patient;
-    }    
+    }
 
     private Collection<Program> programs = new ArrayList<Program>();
 
@@ -151,15 +151,15 @@
         // ---------------------------------------------------------------------
         // Validate selected Patient
         // ---------------------------------------------------------------------
-        
-        if( id != null )
+
+        if ( id != null )
         {
             patient = patientService.getPatient( id );
         }
-        
-        if( id == null )
+
+        if ( id == null )
         {
-            patient = selectedStateManager.getSelectedPatient();           
+            patient = selectedStateManager.getSelectedPatient();
         }
 
         if ( patient == null )
@@ -174,11 +174,6 @@
 
         selectedStateManager.setSelectedPatient( patient );
 
-        if ( patient == null )
-        {
-            return SUCCESS;
-        }        
-
         // ---------------------------------------------------------------------
         // Load Programs
         // ---------------------------------------------------------------------