Index: vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchExportedService/BatchPitchExportHelper/BepaalVolgnummer/Test.cls.xml
===================================================================
diff -u -r71747 -r71751
--- vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchExportedService/BatchPitchExportHelper/BepaalVolgnummer/Test.cls.xml	(.../Test.cls.xml)	(revision 71747)
+++ vhUnitTest/APPS/Halux/Planning/Pitching/impl/BatchPitchExportedService/BatchPitchExportHelper/BepaalVolgnummer/Test.cls.xml	(.../Test.cls.xml)	(revision 71751)
@@ -141,7 +141,6 @@
 	
 	Do $$$AssertEquals(Volgnummer, VerwachtVolgnummer)
 	
-	;Do VorigeBatchMock.Verifieer()
 	Do BatchPitchedRepositoryMock.Verifieer()
 	Do BatchPitchExportedRepositoryMock.Verifieer()
 ]]></Implementation>
@@ -278,6 +277,67 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Indien meerdere geptichte batches worden gevonden voor dezelfde lijnnr en pitchorde -&gt; error gooien">
+<Implementation><![CDATA[
+	#dim Pitchorde As %Integer = 2
+	#dim LijnNr As %Integer = 1
+
+ 	#dim DummyPitchedBatch As APPS.Halux.Planning.Pitching.dto.BatchPitched = ..GeefBatchPitched(LijnNr, Pitchorde)
+ 	
+ 	Set PitchedBatch1 = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
+ 	Set PitchedBatch2 = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitched).%New()
+ 	#dim PitchBatchIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(PitchedBatch1, PitchedBatch2)
+ 	 	
+	Set BatchPitchedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository).%New()
+	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekViaPitchordeEnLijnNr", Pitchorde - 1, LijnNr).DanReturn(PitchBatchIterator)
+
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Meerdere geptichte batches gevonden voor pitchorde '1' en Lijnnummer '1'.")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataCorruptException",Substrings))
+
+	Set BatchPitchExportedHelper = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService.BatchPitchExportedHelper).%New(BatchPitchedRepositoryMock)
+	Do BatchPitchExportedHelper.BepaalVolgnummer(DummyPitchedBatch)
+	
+	Do BatchPitchedRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Indien meerdere ge-exporteeerde batches worden gevonden voor dezelfde batchid -&gt; error gooien">
+<Implementation><![CDATA[
+	#dim ReedsAanwezigVolgnummer = 100
+	#dim Pitchorde As %Integer = 1
+	#dim LijnNr As %Integer = 1
+	#dim AantalBatchesPitched = 3
+	#dim VolgendeBatchId = 222222
+	
+ 	#dim DummyPitchedBatch As APPS.Halux.Planning.Pitching.dto.BatchPitched = ..GeefBatchPitched(LijnNr, Pitchorde)
+ 	#dim LegeIterator As TECH.ListIterator = ##class(TECH.ListIterator).%New(##class(%ListOfObjects).%New())
+ 	
+ 	#dim VolgendeBatchMock As vhTest.Mock.APPS.Halux.common.Batch = ..GeefBatchMock(VolgendeBatchId, LijnNr)
+ 	#dim VolgendeDummyPitchedBatch As TECH.Iterator = ..GeefBatchPitchedIterator(LijnNr, Pitchorde + 1, VolgendeBatchMock)
+ 	 	
+	Set BatchPitchedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchedRepository).%New()
+	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekViaPitchordeEnLijnNr", Pitchorde - 1, LijnNr).DanReturn(LegeIterator)
+	Do BatchPitchedRepositoryMock.VerwachtMethodCall("ZoekViaPitchordeEnLijnNr", Pitchorde + 1, LijnNr).DanReturn(VolgendeDummyPitchedBatch)
+	Do BatchPitchedRepositoryMock.VerwachtMethodCall("GeefHoogstePitchordeVoorLijnNr", LijnNr).DanReturn(AantalBatchesPitched)
+	
+	Set BatchPitchedExported1 = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitchExported).%New()
+	Set BatchPitchedExported2 = ##class(APPS.Halux.Planning.Pitching.dto.BatchPitchExported).%New()
+	#dim BatchPitchExported As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects(BatchPitchedExported1, BatchPitchedExported2)
+	
+	Set BatchPitchExportedRepositoryMock = ##class(vhTest.Mock.APPS.Halux.Planning.Pitching.impl.BatchPitchExportedRepository).%New()	
+	Do BatchPitchExportedRepositoryMock.VerwachtMethodCall("ZoekViaBatchId", VolgendeBatchId).DanReturn(BatchPitchExported)
+	
+	#dim Substrings = ##class(TECH.ListUtils).CreateListOfDataTypes("Meerdere ge-exporteerde batches gevonden voor batchid '222222'.")
+	do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataCorruptException",Substrings))
+	
+	Set BatchPitchExportedHelper = ##class(APPS.Halux.Planning.Pitching.impl.BatchPitchExportedService.BatchPitchExportedHelper).%New(BatchPitchedRepositoryMock, BatchPitchExportedRepositoryMock)
+	Do BatchPitchExportedHelper.BepaalVolgnummer(DummyPitchedBatch)
+
+	Do BatchPitchedRepositoryMock.Verifieer()
+	Do BatchPitchExportedRepositoryMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="GeefBatchMock">
 <FormalSpec>BatchId:%String,LijnNr:%Integer</FormalSpec>
 <Private>1</Private>
Index: APPS/Halux/Planning/Pitching/impl/BatchPitchExportedService/BatchPitchExportedHelper.cls.xml
===================================================================
diff -u -r71738 -r71751
--- APPS/Halux/Planning/Pitching/impl/BatchPitchExportedService/BatchPitchExportedHelper.cls.xml	(.../BatchPitchExportedHelper.cls.xml)	(revision 71738)
+++ APPS/Halux/Planning/Pitching/impl/BatchPitchExportedService/BatchPitchExportedHelper.cls.xml	(.../BatchPitchExportedHelper.cls.xml)	(revision 71751)
@@ -37,6 +37,7 @@
 <ReturnType>%Integer</ReturnType>
 <Implementation><![CDATA[
 	#dim Volgnummer As %Integer = 0
+	
 	#dim IsBatchVooraanToegevoegd As %Boolean = ..BepaalIsBatchVooraanToegevoegd(PitchedBatch)
 	#dim IsBatchAchteraanToegevoegd As %Boolean = ..BepaalIsBatchAchteraanToegevoegd(PitchedBatch)
 	
@@ -184,13 +185,14 @@
 <ReturnType>APPS.Halux.Planning.Pitching.dto.BatchPitched</ReturnType>
 <Implementation><![CDATA[
 	#dim GepitchteBatch As APPS.Halux.Planning.Pitching.dto.BatchPitched = ""
-	#dim GepitchteBatchesIterator As TECH.Iterator = ..BatchPitchedRepository.ZoekViaPitchordeEnLijnNr(PitchOrde, LijnNummer)
+	#dim GepitchteBatchesIterator As TECH.Iterator = ..BatchPitchedRepository.ZoekViaPitchordeEnLijnNr(PitchOrde, LijnNummer)	
 	#dim GepitchteBatchesLijst As %ListOfObjects = ##class(TECH.ListUtils).IteratorToList(GepitchteBatchesIterator)
 	
 	If (GepitchteBatchesLijst.Size = 1) {
 		Set GepitchteBatch = GepitchteBatchesLijst.GetAt(1)
 	} ElseIf (GepitchteBatchesLijst.Size > 1 ) {
-		// Error gooien
+		Set Exception = ##class(TECH.Exceptions.DataCorruptException).%New("Meerdere geptichte batches gevonden voor pitchorde '" _ PitchOrde _ "' en Lijnnummer '" _ LijnNummer _ "'.")
+		do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
 	
 	Quit GepitchteBatch
@@ -209,7 +211,8 @@
 	If (BatchPitchExportedLijst.Size = 1) {
 		Set BatchPitchExported = BatchPitchExportedLijst.GetAt(1)
 	} ElseIf (BatchPitchExportedLijst.Size > 1 ) {
-		// Error gooien
+		Set Exception = ##class(TECH.Exceptions.DataCorruptException).%New("Meerdere ge-exporteerde batches gevonden voor batchid '" _ BatchId _ "'.")
+		do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
 	
 	Quit BatchPitchExported