Index: EXT/Optima/CalculPrix/ServiceWeb.cls.xml
===================================================================
diff -u -r31932 -r31954
--- EXT/Optima/CalculPrix/ServiceWeb.cls.xml	(.../ServiceWeb.cls.xml)	(revision 31932)
+++ EXT/Optima/CalculPrix/ServiceWeb.cls.xml	(.../ServiceWeb.cls.xml)	(revision 31954)
@@ -39,15 +39,8 @@
 
 	#dim EDIAanvraag As APPS.EDI.PrijsBerekening.dto.Aanvraag = RequestVerwerker.Verwerk(Request)
 	#dim EDIResultaat As APPS.EDI.PrijsBerekening.dto.Resultaat = Service.GeefPrijs(EDIAanvraag)
-	
-	#dim Response As EXT.Optima.CalculPrix.dto.Response
-	If $IsObject(EDIResultaat.Exceptie) {
-		Set Response = ResponseVerwerker.VerwerkExceptie(EDIResultaat.Exceptie)
-	}
-	Else {
-		Set Response = ResponseVerwerker.Verwerk(EDIResultaat)		
-	}
-	
+	#dim Response As EXT.Optima.CalculPrix.dto.Response = ResponseVerwerker.Verwerk(EDIResultaat)
+
 	;d WLIP^vhDBG(97,"Test "_$$ObjToText^vhLib(Response))
 	Quit Response
 ]]></Implementation>
Index: EXT/Optima/CalculPrix/impl/ResponseVerwerker.cls.xml
===================================================================
diff -u -r31937 -r31954
--- EXT/Optima/CalculPrix/impl/ResponseVerwerker.cls.xml	(.../ResponseVerwerker.cls.xml)	(revision 31937)
+++ EXT/Optima/CalculPrix/impl/ResponseVerwerker.cls.xml	(.../ResponseVerwerker.cls.xml)	(revision 31954)
@@ -7,6 +7,19 @@
 <FormalSpec>EDIResultaat:APPS.EDI.PrijsBerekening.dto.Resultaat</FormalSpec>
 <ReturnType>EXT.Optima.CalculPrix.dto.Response</ReturnType>
 <Implementation><![CDATA[
+	If $IsObject(EDIResultaat.Exceptie) {
+		Quit ..VerwerkExceptie(EDIResultaat.Exceptie)
+	}
+	Else {
+		Quit ..VerwerkSucces(EDIResultaat)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="VerwerkSucces">
+<FormalSpec>EDIResultaat:APPS.EDI.PrijsBerekening.dto.Resultaat</FormalSpec>
+<ReturnType>EXT.Optima.CalculPrix.dto.Response</ReturnType>
+<Implementation><![CDATA[
 	Set Response = ##class(EXT.Optima.CalculPrix.dto.Response).%New()
 	Set Response.KostPrijs = EDIResultaat.KostPrijs
 	Set Response.RefVanHoecke = EDIResultaat.OfferteID_"-"_EDIResultaat.LijnID