Index: WSimpl/Halux/PPS/Verpakking/TAXFlatpackV1Controle/BijladenPickToLightService.cls.xml
===================================================================
diff -u -r37421 -r37424
--- WSimpl/Halux/PPS/Verpakking/TAXFlatpackV1Controle/BijladenPickToLightService.cls.xml	(.../BijladenPickToLightService.cls.xml)	(revision 37421)
+++ WSimpl/Halux/PPS/Verpakking/TAXFlatpackV1Controle/BijladenPickToLightService.cls.xml	(.../BijladenPickToLightService.cls.xml)	(revision 37424)
@@ -34,6 +34,10 @@
 	#dim Locatie As TECH.String = ""
 	#dim ProductIterator As TECH.Iterator = ..ProductRepository.ZoekViaBarcode(Id)
 	
+	If $$$Not(ProductIterator.HasNext()) {
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.DataNotFoundException).%New("Geen Product gevonden met barcode '" _ Id _ "'"))	
+	}
+	
 	While (ProductIterator.HasNext() && (Locatie = "")) {
 		#dim Product As Prod.Product = ProductIterator.Next()
 		
Index: vhUnitTest/WSimpl/Halux/PPS/Verpakking/TAXFlatpackV1Controle/BijladenPickToLightService/Test.cls.xml
===================================================================
diff -u -r37421 -r37424
--- vhUnitTest/WSimpl/Halux/PPS/Verpakking/TAXFlatpackV1Controle/BijladenPickToLightService/Test.cls.xml	(.../Test.cls.xml)	(revision 37421)
+++ vhUnitTest/WSimpl/Halux/PPS/Verpakking/TAXFlatpackV1Controle/BijladenPickToLightService/Test.cls.xml	(.../Test.cls.xml)	(revision 37424)
@@ -8,6 +8,11 @@
 <Default>1000</Default>
 </Parameter>
 
+<Parameter name="RandomBarcode">
+<Type>%String</Type>
+<Default>RandomBarcode</Default>
+</Parameter>
+
 <Method name="OnBeforeAllTests">
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
@@ -34,21 +39,36 @@
 	Set OnderdeelLocatie.Locatie = RandomLocatie	
 	
 	#dim ProductRepositoryMock As vhTest.Mock.Prod.ProductRepository = ##class(vhTest.Mock.Prod.ProductRepository).%New()
-	Do ProductRepositoryMock.VerwachtMethodCall("ZoekViaBarcode", ..#ProductId).DanReturn(ProductIterator)
+	Do ProductRepositoryMock.VerwachtMethodCall("ZoekViaBarcode", ..#RandomBarcode).DanReturn(ProductIterator)
 	
 	#dim OnderdeelLocatieRepositoryMock As vhTest.Mock.TECH.Persistentie.Repository = ##class(vhTest.Mock.TECH.Persistentie.Repository).%New()
 	Do OnderdeelLocatieRepositoryMock.VerwachtMethodCall("BestaatViaID", ..#ProductId).DanReturn($$$True)
 	Do OnderdeelLocatieRepositoryMock.VerwachtMethodCall("GeefViaID", ..#ProductId).DanReturn(OnderdeelLocatie)
 	
 	#dim Service As WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.BijladenPickToLightService = ##class(WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.BijladenPickToLightService).%New(ProductRepositoryMock, OnderdeelLocatieRepositoryMock)
-	#dim Locatie As TECH.String = Service.GeefLocatie(..#ProductId)
+	#dim Locatie As TECH.String = Service.GeefLocatie(..#RandomBarcode)
 	
 	Do $$$AssertEquals(Locatie, OnderdeelLocatie.Locatie)
 	
 	Do ProductRepositoryMock.Verifieer()
 	Do OnderdeelLocatieRepositoryMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Exceptie wordt geraised indien geen Product met opgegeven barcode gevonden wordt">
+<Implementation><![CDATA[
+	#dim ProductIterator As TECH.Iterator = ##class(TECH.ListUtils).CreateIteratorOfObjects()
+	
+	#dim ProductRepositoryStub As vhTest.Mock.Prod.ProductRepository = ##class(vhTest.Mock.Prod.ProductRepository).%New()
+	Do ProductRepositoryStub.IndienMethodCall("ZoekViaBarcode", ..#RandomBarcode).DanReturn(ProductIterator)
+	
+	#dim Omschrijvingen As %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen Product gevonden met barcode", ..#RandomBarcode)	
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.DataNotFoundException", Omschrijvingen))
+	
+	#dim Service As WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.BijladenPickToLightService = ##class(WSimpl.Halux.PPS.Verpakking.TAXFlatpackV1Controle.BijladenPickToLightService).%New(ProductRepositoryStub)
+	#dim Locatie As TECH.String = Service.GeefLocatie(..#RandomBarcode)
+]]></Implementation>
+</Method>
 </Class>