Index: EXT/Unishop/PurchaseOrderService001/Service.cls.xml
===================================================================
diff -u -r32529 -r33311
--- EXT/Unishop/PurchaseOrderService001/Service.cls.xml	(.../Service.cls.xml)	(revision 32529)
+++ EXT/Unishop/PurchaseOrderService001/Service.cls.xml	(.../Service.cls.xml)	(revision 33311)
@@ -40,8 +40,13 @@
 <Implementation><![CDATA[
 	do:CreateOrderRequest.Merkteken'="3}Z7Mb-(8aP*P/[]" ##class(TECH.Exceptions.InvalidInputException).Throw("Token not valid for this system")
 	
-	#dim Response As EXT.Unishop.PurchaseOrderService001.CreateOrder.Response
-	set Response = ..CreateResponse(..BestelService.PlaatsBestelling(..OrderConverter.Converteer(CreateOrderRequest.Order)))
+	try {
+		#dim Response As EXT.Unishop.PurchaseOrderService001.CreateOrder.Response
+		set Response = ..CreateResponse(..BestelService.PlaatsBestelling(..OrderConverter.Converteer(CreateOrderRequest.Order)))
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		do ##class(TECH.Exceptions.InvalidInputException).Throw("Failed to convert the request")
+	}
 	quit Response
 ]]></Implementation>
 </Method>
Index: vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandVerwerker.VerwerkBestand/Test/Alpnach.xml
===================================================================
diff -u -r32520 -r33311
--- vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandVerwerker.VerwerkBestand/Test/Alpnach.xml	(.../Alpnach.xml)	(revision 32520)
+++ vhTestFiles/UnitTests/EXT.Unishop.PurchaseOrder001.BestandVerwerker.VerwerkBestand/Test/Alpnach.xml	(.../Alpnach.xml)	(revision 33311)
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<PurchaseOrders xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-	<PurchaseOrder>
+<PurchaseOrder xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 		<PurchaseOrderNumber>0000015042</PurchaseOrderNumber>
 		<PurchaseOrderReference>PIUS.AMSTAD</PurchaseOrderReference>
 		<RequestedDeliveryDate></RequestedDeliveryDate>
@@ -245,4 +244,3 @@
 			</PurchaseOrderLine>
 		</PurchaseOrderLines>
 	</PurchaseOrder>
-</PurchaseOrders>
\ No newline at end of file
Index: vhUnitTest/EXT/Unishop/PurchaseOrder001/BestandVerwerker/VerwerkBestand/Test.cls.xml
===================================================================
diff -u -r32529 -r33311
--- vhUnitTest/EXT/Unishop/PurchaseOrder001/BestandVerwerker/VerwerkBestand/Test.cls.xml	(.../Test.cls.xml)	(revision 32529)
+++ vhUnitTest/EXT/Unishop/PurchaseOrder001/BestandVerwerker/VerwerkBestand/Test.cls.xml	(.../Test.cls.xml)	(revision 33311)
@@ -21,22 +21,18 @@
 	#dim CorrelatedObjects As %ListOfObjects = XmlCorrelaterSpy.GeefObjecten()
 	
 	if $$$AssertEquals(CorrelatedObjects.Count(),1) {
-		#dim Orders As EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders = CorrelatedObjects.GetAt(1)
-		do $$$AssertEquals($classname(Orders),"EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders")
-		if $$$AssertEquals(Orders.Orders.Count(),1) {
-			#dim Order As EXT.Unishop.PurchaseOrderService001.CreateOrder.Order = Orders.Orders.GetAt(1)
-			do $$$AssertEquals($classname(Order),"EXT.Unishop.PurchaseOrderService001.CreateOrder.Order")
-			do $$$AssertEquals(Order.Lijnen.Count(),7)
-		}
+		#dim Order As EXT.Unishop.PurchaseOrderService001.CreateOrder.Order = CorrelatedObjects.GetAt(1)
+		do $$$AssertEquals($classname(Order),"EXT.Unishop.PurchaseOrderService001.CreateOrder.Order")
+		do $$$AssertEquals(Order.Lijnen.Count(),7)
 	}
 ]]></Implementation>
 </Method>
 
 <Method name="Test : Verwerker roept de correlator correct op">
 <Implementation><![CDATA[
-	set DummyOrders = ##class(EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders).%New()
+	set DummyOrder = ##class(EXT.Unishop.PurchaseOrderService001.CreateOrder.Order).%New()
 	set MockCorrelator = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
-	do MockCorrelator.VerwachtMethodCall("GeefObjectVanBestand",..BestandVolledigeNaam,"EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders","PurchaseOrders").DanReturn(DummyOrders).ExactAantalKeer(1)
+	do MockCorrelator.VerwachtMethodCall("GeefObjectVanBestand",..BestandVolledigeNaam,"EXT.Unishop.PurchaseOrderService001.CreateOrder.Order","PurchaseOrder").DanReturn(DummyOrder).ExactAantalKeer(1)
 	
 	set DummyEdiBestelService = ##class(vhTest.Dummy.APPS.EDI.Bestel.BestelService).%New()
 	
@@ -48,11 +44,10 @@
 
 <Method name="Test : Na een goede correlate wordt de bestel service opgeroepen met de juiste parameters">
 <Implementation><![CDATA[
-	set DummyOrders = ##class(EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders).%New()
-	do DummyOrders.Orders.Insert(##class(vhTest.Utils.EXT.Unishop.PurchaseOrderService001.CreateOrder.Order).TaorboxOrder())
-	
+	#dim DummyOrder As EXT.Unishop.PurchaseOrderService001.CreateOrder.Order = ##class(vhTest.Utils.EXT.Unishop.PurchaseOrderService001.CreateOrder.Order).TaorboxOrder()
+		
 	set StubCorrelator = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
-	do StubCorrelator.IndienMethodCall("GeefObjectVanBestand",..BestandVolledigeNaam,"EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders","PurchaseOrders").DanReturn(DummyOrders)
+	do StubCorrelator.IndienMethodCall("GeefObjectVanBestand",..BestandVolledigeNaam,"EXT.Unishop.PurchaseOrderService001.CreateOrder.Order","PurchaseOrder").DanReturn(DummyOrder)
 	
 	set EdiBestelServiceSpy = ##class(vhTest.Spy.APPS.EDI.Bestel.BestelService).%New()
 	
Index: EXT/Unishop/PurchaseOrder001/BestandVerwerker.cls.xml
===================================================================
diff -u -r32533 -r33311
--- EXT/Unishop/PurchaseOrder001/BestandVerwerker.cls.xml	(.../BestandVerwerker.cls.xml)	(revision 32533)
+++ EXT/Unishop/PurchaseOrder001/BestandVerwerker.cls.xml	(.../BestandVerwerker.cls.xml)	(revision 33311)
@@ -35,13 +35,9 @@
 <Method name="VerwerkBestand">
 <FormalSpec>BestandVolledigeNaam:%String</FormalSpec>
 <Implementation><![CDATA[
-	#dim ClassName As %String = ##class(EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders).%ClassName(1)
-	#dim Orders As EXT.Unishop.PurchaseOrderService001.CreateOrder.Orders = ..XmlCorrelater.GeefObjectVanBestand(BestandVolledigeNaam,ClassName,"PurchaseOrders")
-	set OrderIterator = ##class(TECH.ListIterator).%New(Orders.Orders)
-	while OrderIterator.HasNext() {
-		#dim Order As EXT.Unishop.PurchaseOrderService001.CreateOrder.Order = OrderIterator.Next()
-		do ..BestelService.PlaatsBestelling(..OrderConverter.Converteer(Order))
-	}
+	#dim ClassName As %String = ##class(EXT.Unishop.PurchaseOrderService001.CreateOrder.Order).%ClassName(1)
+	#dim Order As EXT.Unishop.PurchaseOrderService001.CreateOrder.Order = ..XmlCorrelater.GeefObjectVanBestand(BestandVolledigeNaam,ClassName,"PurchaseOrder")
+	do ..BestelService.PlaatsBestelling(..OrderConverter.Converteer(Order))
 ]]></Implementation>
 </Method>
 </Class>