=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java'
--- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2013-09-19 08:26:17 +0000
+++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2013-09-20 09:01:03 +0000
@@ -664,7 +664,11 @@
             {
                 ProgramStageInstance programStageInstance = generateEvent( programInstance, programStage,
                     enrollmentDate, dateOfIncident, organisationUnit );
-                programStageInstanceService.addProgramStageInstance( programStageInstance );
+
+                if ( programStageInstance != null )
+                {
+                    programStageInstanceService.addProgramStageInstance( programStageInstance );
+                }
             }
         }