=== 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	2014-01-14 11:12:16 +0000
+++ dhis-2/dhis-services/dhis-service-dxf2/src/main/java/org/hisp/dhis/dxf2/events/event/AbstractEventService.java	2014-01-24 04:47:13 +0000
@@ -259,7 +259,16 @@
             }
 
             programInstance = programInstances.get( 0 );
-            programStageInstance = programInstance.getProgramStageInstanceByStage( 1 );
+
+            if ( event.getEvent() != null )
+            {
+                programStageInstance = programStageInstanceService.getProgramStageInstance( event.getEvent() );
+
+                if ( programStageInstance == null )
+                {
+                    return new ImportSummary( ImportStatus.ERROR, "Event.event did not point to a valid event" );
+                }
+            }
         }
 
         OrganisationUnit organisationUnit = organisationUnitService.getOrganisationUnit( event.getOrgUnit() );