Index: AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml
===================================================================
diff -u -r48519 -r48550
--- AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 48519)
+++ AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter.cls.xml	(.../SalesOrderConverter.cls.xml)	(revision 48550)
@@ -115,6 +115,20 @@
 <FormalSpec>Message:AXif.Dynamics.SalesOrderIn.Envelope</FormalSpec>
 <Implementation><![CDATA[
 	#dim OrderHeader As AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderHeader = Message.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.GetAt(1)
+	Try {
+		Do ..ConvertMessage(OrderHeader)
+	} Catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do ..Mailer.VerzendFoutMelding(OrderHeader.CustAccount, OrderHeader.SalesId, Exception)
+		Do ##class(TECH.ExceptionHandler).Throw(Exception)
+	}
+]]></Implementation>
+</Method>
+
+<Method name="ConvertMessage">
+<FormalSpec>OrderHeader:AXif.Dynamics.SalesOrderIn.MessageParts.AxdEntityOrderHeader</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
 	#dim KlantID As %String = ##class(AXimpl.AxToAdminUtils).ConvertCustomerID(OrderHeader.CustAccount)
 	
 	#Dim Order As DOM.VKP.Order = ..GeefOfMaakOrder(KlantID, OrderHeader)
Index: vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml
===================================================================
diff -u -r48519 -r48550
--- vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 48519)
+++ vhUnitTest/AXimpl/Dynamics/SalesOrderIn/Converter/SalesOrderConverter/Convert/Test.cls.xml	(.../Test.cls.xml)	(revision 48550)
@@ -210,8 +210,13 @@
 	Set StandaardOrder.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.GetAt(1).RefSalesOriginId = "VO1600000999"
 	Set StandaardOrder.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.GetAt(1).SalesId = "VO1600000999"
 
-	Set SalesOrderConverter = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter).%New()
+	Set MailerMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.Mailer).%New()
+	Do MailerMock.VerwachtMethodCall("VerzendFoutMelding", "12526", "VO1600000999", $$$ElkeWaarde).ExactAantalKeer(1).DanDoeNiks()
+
+	Set SalesOrderConverter = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter).%New(,,,,,,,,,,,,MailerMock)
 	Do SalesOrderConverter.Convert(StandaardOrder)
+	
+	Do MailerMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -224,8 +229,13 @@
 	Set StandaardOrder.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.GetAt(1).RefSalesOriginId = "VO1600100000"
 	Set StandaardOrder.Body.MessageParts.ADUMsgSalesOrderOutQuery.OrderHeader.GetAt(1).SalesId = "VO1600100000"
 
-	Set SalesOrderConverter = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter).%New()
+	Set MailerMock = ##class(vhTest.Mock.AXimpl.Dynamics.SalesOrderIn.Converter.Mailer).%New()
+	Do MailerMock.VerwachtMethodCall("VerzendFoutMelding", "12526", "VO1600100000", $$$ElkeWaarde).ExactAantalKeer(1).DanDoeNiks()
+	
+	Set SalesOrderConverter = ##class(AXimpl.Dynamics.SalesOrderIn.Converter.SalesOrderConverter).%New(,,,,,,,,,,,,MailerMock)
 	Do SalesOrderConverter.Convert(StandaardOrder)
+
+	Do MailerMock.Verifieer()
 ]]></Implementation>
 </Method>