Index: BL/PPS/TBX/DocsV1/ProboxBarcodeEtiketGenerator.cls.xml
===================================================================
diff -u -r68374 -r68388
--- BL/PPS/TBX/DocsV1/ProboxBarcodeEtiketGenerator.cls.xml	(.../ProboxBarcodeEtiketGenerator.cls.xml)	(revision 68374)
+++ BL/PPS/TBX/DocsV1/ProboxBarcodeEtiketGenerator.cls.xml	(.../ProboxBarcodeEtiketGenerator.cls.xml)	(revision 68388)
@@ -31,11 +31,13 @@
 <FormalSpec>DnaCodeIterator:TECH.Iterator,LabelDevice:%String</FormalSpec>
 <ReturnType>TECH.ListIterator</ReturnType>
 <Implementation><![CDATA[
-	Set ProboxBarcodeLabelLijst = ##class(%ListOfDataTypes).%New()
-	
-	If ($$$Not(DnaCodeIterator.HasNext())) {
-		Quit ##class(TECH.ListIterator).%New(ProboxBarcodeLabelLijst)
+	If ($$$Not(DnaCodeIterator.HasNext())) 
+	{
+		Set Exception = ##class(TECH.Exceptions.InvalidInputException).%New("Geen Dna codes meegegeven.")
+		Do ##class(TECH.ExceptionHandler).Throw(Exception)
 	}
+	
+	Set ProboxBarcodeLabelLijst = ##class(%ListOfDataTypes).%New()
  	
  	#dim GesorteerdeDnaCodeIterator As TECH.ListIterator = ..GeefGesorteerdeDnaCodeIterator(DnaCodeIterator)
  	#dim DnaCode As DOM.Halux.AAP.DnaCode = GesorteerdeDnaCodeIterator.Next()
Index: vhUnitTest/BL/PPS/TBX/DocsV1/ProboxBarcodeEtiketGenerator/GenereerProboxBarcodeEtiketIterator/Test.cls.xml
===================================================================
diff -u -r68376 -r68388
--- vhUnitTest/BL/PPS/TBX/DocsV1/ProboxBarcodeEtiketGenerator/GenereerProboxBarcodeEtiketIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 68376)
+++ vhUnitTest/BL/PPS/TBX/DocsV1/ProboxBarcodeEtiketGenerator/GenereerProboxBarcodeEtiketIterator/Test.cls.xml	(.../Test.cls.xml)	(revision 68388)
@@ -55,12 +55,14 @@
 ]]></Implementation>
 </Method>
 
-<Method name="Test: Geen DnaCodeIterator meegegeven geeft lege iterator terug">
+<Method name="Test: Geen IteratorDnaCode meegegeven">
 <Implementation><![CDATA[
-	Set ProboxBarcodeEtiketGenerator = ##class(BL.PPS.TBX.DocsV1.ProboxBarcodeEtiketGenerator).%New(..ProductAPIStub, ..ToeleveringServiceStub)
-	#dim EtiketIterator As TECH.ListIterator = ProboxBarcodeEtiketGenerator.GenereerProboxBarcodeEtiketIterator(..EmptyIterator(), ..Device)
+	Set ProboxBarcodeEtiketGenerator = ##class(BL.PPS.TBX.DocsV1.ProboxBarcodeEtiketGenerator).%New()
 	
-	Do $$$AssertFalse(EtiketIterator.HasNext())
+	#dim Substring = ##class(TECH.ListUtils).CreateListOfDataTypes("Geen Dna codes meegegeven.")
+	Do ..ZetVerwachteExceptie(##class(Tools.Test.VerwachteExceptie).%New("TECH.Exceptions.InvalidInputException",Substring))
+	
+	Do ProboxBarcodeEtiketGenerator.GenereerProboxBarcodeEtiketIterator(..EmptyIterator())
 ]]></Implementation>
 </Method>
 
Index: BL/PPS/TBX/DocsV1.cls.xml
===================================================================
diff -u -r68367 -r68388
--- BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 68367)
+++ BL/PPS/TBX/DocsV1.cls.xml	(.../DocsV1.cls.xml)	(revision 68388)
@@ -170,6 +170,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ProboxBarcodeEtiketGenerator">
+<Type>BL.PPS.TBX.DocsV1.ProboxBarcodeEtiketGenerator</Type>
+<Private>1</Private>
+</Property>
+
 <Property name="Printer">
 <Type>%String</Type>
 <Private>1</Private>
@@ -192,6 +197,7 @@
 	Set ..MatFormatter = ##class(APPS.Halux.PPS.impl.Formatter.Mat).%New()
 	Set ..LogoBepaler = $$$Inject(LogoBepaler, ##class(BL.PPS.common.impl.OnderdelendoosLogoBepaler).%New())
 	Set ..ProboxInhoudEtiketGenerator = ##class(BL.PPS.TBX.DocsV1.ProboxInhoudEtiketGenerator).%New()
+	Set ..ProboxBarcodeEtiketGenerator = ##class(BL.PPS.TBX.DocsV1.ProboxBarcodeEtiketGenerator).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -1658,7 +1664,7 @@
 <FormalSpec>DnaCodeIterator:TECH.Iterator</FormalSpec>
 <Implementation><![CDATA[
  	Do ..blLabelPrinter.Clear()
- 	#dim ProboxBarcodeLabelIterator As TECH.Iterator = ..ProboxInhoudEtiketGenerator.GenereerProboxBarcodeEtiketIterator(DnaCodeIterator, ..LabelDevice)
+ 	#dim ProboxBarcodeLabelIterator As TECH.Iterator = ..ProboxBarcodeEtiketGenerator.GenereerProboxBarcodeEtiketIterator(DnaCodeIterator, ..LabelDevice)
  	#dim ProboxBarcodeLabel As BL.Etiket.ProboxBarcode
  	
  	While ProboxBarcodeLabelIterator.HasNext() {