Index: vhUnitTest/EXT/Optima/CalculPrix/ServiceWeb/CalculerTiroir/Test.cls.xml
===================================================================
diff -u -r32056 -r32076
--- vhUnitTest/EXT/Optima/CalculPrix/ServiceWeb/CalculerTiroir/Test.cls.xml	(.../Test.cls.xml)	(revision 32056)
+++ vhUnitTest/EXT/Optima/CalculPrix/ServiceWeb/CalculerTiroir/Test.cls.xml	(.../Test.cls.xml)	(revision 32076)
@@ -31,13 +31,14 @@
 ]]></Implementation>
 </Method>
 
-<Method name="aTestFouteAanvraagOnvolledigeKenmerken">
+<Method name="TestFouteAanvraagOnvolledigeKenmerken">
 <Implementation><![CDATA[
 	#dim Request As EXT.Optima.CalculPrix.dto.Request = ..MaakRequestTAX(1,520)
 
 	#dim Response As EXT.Optima.CalculPrix.dto.Response = ..WebService.CalculerTiroir(Request)
 
-	Do ..AssertResponseError(Response,"-1010")
+	#dim VerwachteBinaireFoutWaarde As %BigInt = 1936989
+	Do ..AssertResponseError(Response,VerwachteBinaireFoutWaarde)
 ]]></Implementation>
 </Method>
 
Index: APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService.cls.xml
===================================================================
diff -u -r32065 -r32076
--- APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService.cls.xml	(.../PrijsBerekeningService.cls.xml)	(revision 32065)
+++ APPS/EDI/PrijsBerekening/impl/PrijsBerekeningService.cls.xml	(.../PrijsBerekeningService.cls.xml)	(revision 32076)
@@ -44,18 +44,24 @@
 <ReturnType>APPS.EDI.PrijsBerekening.dto.Resultaat</ReturnType>
 <Implementation><![CDATA[
 	Set Resultaat = ##class(APPS.EDI.PrijsBerekening.dto.Resultaat).%New()
-	try {
+	Try {
 		#dim KlantID As DOM.VKP.KlantID = EDIAanvraag.KlantID
 		#dim IngegevenKenmerken As APPS.PM.Maatwerk.dto.IngegevenKenmerken = ..EDIAanvraagConvertor.GeefIngegevenKenmerken(EDIAanvraag)
+	} Catch {
+		#dim IKException As TECH.ObjectUtils.ObjectConverterException = ##class(TECH.ExceptionHandler).Catch("TECH.ObjectUtils.ObjectConverterException")
+		#dim NewException As TECH.Exceptions.Exception = IKException.ConverteerOutputExceptionsNaarInput(..EDIAanvraagConvertor.GeefConvertData())
+		Do ##class(TECH.ExceptionHandler).Throw(NewException)
+	}
 
+	Try {
 		#dim Data As APPS.EDI.PrijsBerekening.data.PrijsBerekening = ..GeefData(KlantID)
 		#dim WinkelkarID As %String = Data.Winkelkar.GeefID()
 		#dim Lijn As DOM.EC.Winkelkar.MaatwerkLijn = ..GeefBerekendeMaatwerkLijn(Data.Winkelkar,IngegevenKenmerken,EDIAanvraag.Aantal)
 		
 		Set Resultaat.OfferteID = ""   ; WinkelkarID   ; ??? 
 		Set Resultaat.LijnID = "VH_Fixed"   ;  Lijn.GeefID() ??? 
 		Set Resultaat.KostPrijs = Lijn.GeefTotaalPrijs()
-	} catch {
+	} Catch {
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch("TECH.Exceptions.GeneralErrorException")
 		Set Resultaat.KostPrijs = ""
 		Set Resultaat.Exceptie = Exception
Index: EXT/Optima/CalculPrix/ServiceWeb.cls.xml
===================================================================
diff -u -r32058 -r32076
--- EXT/Optima/CalculPrix/ServiceWeb.cls.xml	(.../ServiceWeb.cls.xml)	(revision 32058)
+++ EXT/Optima/CalculPrix/ServiceWeb.cls.xml	(.../ServiceWeb.cls.xml)	(revision 32076)
@@ -41,14 +41,23 @@
 	
 	Try {
 		#dim EDIAanvraag As APPS.EDI.PrijsBerekening.dto.Aanvraag = RequestVerwerker.Verwerk(Request)
-		#dim EDIResultaat As APPS.EDI.PrijsBerekening.dto.Resultaat = Service.GeefPrijs(EDIAanvraag)
+		
+		Try {
+			#dim EDIResultaat As APPS.EDI.PrijsBerekening.dto.Resultaat = Service.GeefPrijs(EDIAanvraag)
+		} Catch {
+			#dim EDIException As TECH.ObjectUtils.ObjectConverterException = ##class(TECH.ExceptionHandler).Catch("TECH.ObjectUtils.ObjectConverterException")
+			#dim NewException As TECH.Exceptions.Exception = EDIException.ConverteerInputExceptionsNaarOutput()
+			Do ##class(TECH.ExceptionHandler).Throw(NewException)
+		}
+		
 		#dim Response As EXT.Optima.CalculPrix.dto.Response = ResponseVerwerker.Verwerk(EDIResultaat)
 	}
 	Catch {
-		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch("TECH.ObjectUtils.ObjectConverterException","EXT.Optima.CalculPrix.impl.EdiException")
+		#dim Exception As TECH.ObjectUtils.ObjectConverterException = ##class(TECH.ExceptionHandler).Catch()
 		
 		If Exception.%Extends("TECH.ObjectUtils.ObjectConverterException") {
-			#dim BinaireFoutWaarde As %BigInt = ..GeefBinaireFoutWaarde(Exception)
+			#dim RequestDataException As TECH.Exceptions.Exception = Exception.ConverteerOutputExceptionsNaarInput(RequestVerwerker.GeefConvertData(),Request.Lade.%ClassName($$$True))
+			#dim BinaireFoutWaarde As %BigInt = ..GeefBinaireFoutWaarde(RequestDataException)
 			If BinaireFoutWaarde > 0 {
 				Set Exception = ##class(TECH.Exceptions.GeneralErrorException).%New(BinaireFoutWaarde_";Ongeldige Kenmerkwaarden")
 			}