=== modified file 'dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java'
--- dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java	2015-01-17 07:41:26 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java	2015-02-09 08:53:23 +0000
@@ -627,7 +627,12 @@
         event.setEventDate( DateUtils.getLongDateString( programStageInstance.getExecutionDate() ) );
         event.setDueDate( DateUtils.getLongDateString( programStageInstance.getDueDate() ) );
         event.setStoredBy( programStageInstance.getCompletedUser() );
-        event.setOrgUnit( programStageInstance.getOrganisationUnit().getUid() );
+
+        if ( programStageInstance.getOrganisationUnit() != null )
+        {
+            event.setOrgUnit( programStageInstance.getOrganisationUnit().getUid() );
+        }
+
         event.setProgram( programStageInstance.getProgramInstance().getProgram().getUid() );
         event.setEnrollment( programStageInstance.getProgramInstance().getUid() );
         event.setProgramStage( programStageInstance.getProgramStage().getUid() );