=== modified file 'dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java'
--- dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2016-03-08 13:58:56 +0000
+++ dhis-2/dhis-services/dhis-service-core/src/main/java/org/hisp/dhis/program/DefaultProgramInstanceService.java	2016-03-15 11:22:02 +0000
@@ -453,6 +453,13 @@
         // ---------------------------------------------------------------------
         // Add program instance
         // ---------------------------------------------------------------------
+        
+        if( program.getTrackedEntity() != trackedEntityInstance.getTrackedEntity() )
+        {
+            log.warn( "Tracked entitiy instance needs to have the same tracked entity as the program" );
+
+            throw new IllegalQueryException( "Tracked entitiy instance needs to have the same tracked entity as the program" );
+        }
 
         ProgramInstance programInstance = new ProgramInstance();
         programInstance.setUid( CodeGenerator.isValidCode( uid ) ? uid : CodeGenerator.generateCode() );