=== modified file 'dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java' --- dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2012-03-23 03:46:08 +0000 +++ dhis-2/dhis-services/dhis-service-patient/src/main/java/org/hisp/dhis/program/DefaultProgramStageInstanceService.java 2012-04-10 10:10:21 +0000 @@ -381,7 +381,16 @@ if ( !anonymous ) { - grid.addValue( programStageInstance.getProgramInstance().getPatient().getId() ); + ProgramInstance programInstance = programStageInstance.getProgramInstance(); + + if ( programInstance != null && programInstance.getPatient() != null ) + { + grid.addValue( programInstance.getPatient().getId() ); + } + else + { + grid.addValue( "" ); + } } } }