Index: AXimpl/AifMessage/Request.cls.xml
===================================================================
diff -u -r35457 -r35462
--- AXimpl/AifMessage/Request.cls.xml	(.../Request.cls.xml)	(revision 35457)
+++ AXimpl/AifMessage/Request.cls.xml	(.../Request.cls.xml)	(revision 35462)
@@ -18,14 +18,15 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>Command:%String,SubjectId:%String</FormalSpec>
+<FormalSpec>Command:%String,SubjectId:%String,Message:AXaif.Message.Envelope=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
 	set ..Command = Command
-	set ..SubjectId = SubjectId 
+	set ..SubjectId = SubjectId
+	set ..Message = Message 
 	Quit $$$OK
 ]]></Implementation>
 </Method>
Index: vhUnitTest/AXimpl/AifMessage/EventHandler/CustomerUpdaterPart2/Test.cls.xml
===================================================================
diff -u -r35458 -r35462
--- vhUnitTest/AXimpl/AifMessage/EventHandler/CustomerUpdaterPart2/Test.cls.xml	(.../Test.cls.xml)	(revision 35458)
+++ vhUnitTest/AXimpl/AifMessage/EventHandler/CustomerUpdaterPart2/Test.cls.xml	(.../Test.cls.xml)	(revision 35462)
@@ -5,9 +5,8 @@
 
 <Method name="Test: read NOK -&gt; create klant uitvoeren">
 <Implementation><![CDATA[
-	#dim MessageID = "{123456-GUID-321}"
+	#dim MessageID = "{123456-GUID-321}"	
 	
-	
 	Set AifMessage = ##class(AXdata.AifMessage.Message).%New()
 	Set AifMessage.Command = "Customer/UpdatePart1"
 	Set AifMessage.SubjectId = "K||1234"
@@ -19,13 +18,13 @@
 	Set Envelope.Header.RequestMessageId = MessageID
 	Set Envelope.Body.MessageParts.Fault.Code = "NoValidDocumentIdentified"
 	
-	Set Generator = ##class(vhTest.Mock.AX.Uitgaand.common.impl.AifGenerator).%New()
-	Do Generator.VerwachtMethodCall("Generate",..Matches.DataTransferObject(##class(AXimpl.AifMessage.Request).%New("Customer/Create","K||1234"))).ExactAantalKeer(1)
-	Set UpdaterPart2 = ##class(AXimpl.AifMessage.EventHandler.CustomerUpdaterPart2).%New(MessageRepository, Generator)
+	Set GeneratorMock = ##class(vhTest.Mock.AX.Uitgaand.common.impl.AifGenerator).%New()
+	Do GeneratorMock.VerwachtMethodCall("Generate",..Matches.DataTransferObject(##class(AXimpl.AifMessage.Request).%New("Customer/Create","K||1234"))).ExactAantalKeer(1)
+	Set UpdaterPart2 = ##class(AXimpl.AifMessage.EventHandler.CustomerUpdaterPart2).%New(MessageRepository, GeneratorMock)
 	Do UpdaterPart2.Verwerk(Envelope)
 		
 	Do MessageRepository.Verifieer()
-	Do Generator.Verifieer()
+	Do GeneratorMock.Verifieer()
 ]]></Implementation>
 </Method>
 
@@ -51,6 +50,62 @@
 	Do GeneratorMock.Verifieer()
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Read OK -&gt; update uitvoeren">
+<Implementation><![CDATA[
+	#dim MessageID = "{123456-GUID-321}"	
+	
+	Set AifMessage = ##class(AXdata.AifMessage.Message).%New()
+	Set AifMessage.Command = "Customer/UpdatePart1"
+	Set AifMessage.SubjectId = "K||1234"
+	
+	Set MessageRepositoryStub = ##class(vhTest.Mock.AX.AifMessage.MessageRepository).%New()
+	Do MessageRepositoryStub.IndienMethodCall("GeefViaID",MessageID).DanReturn(AifMessage)
+		
+	Set Envelope = ##class(AXaif.Message.Envelope).%New()
+	Set Envelope.Header.RequestMessageId = MessageID
+		
+	Set Request = ##class(AXimpl.AifMessage.Request).%New("Customer/UpdatePart2","K||1234",Envelope)
+	Set GeneratorMock = ##class(vhTest.Mock.AX.Uitgaand.common.impl.AifGenerator).%New()
+	Do GeneratorMock.VerwachtMethodCall("Generate",..Matches.DataTransferObject(Request)).ExactAantalKeer(1)
+	
+	Set UpdaterPart2 = ##class(AXimpl.AifMessage.EventHandler.CustomerUpdaterPart2).%New(MessageRepositoryStub, GeneratorMock)
+	Do UpdaterPart2.Verwerk(Envelope)
+		
+	Do GeneratorMock.Verifieer()
+]]></Implementation>
+</Method>
+
+<Method name="Test: Alle andere AX-fouten worden gedisplayed">
+<Implementation><![CDATA[
+	#dim MessageID = "{123456-GUID-321}"	
+	
+	Set AifMessage = ##class(AXdata.AifMessage.Message).%New()
+	Set AifMessage.Command = "Customer/UpdatePart1"
+	Set AifMessage.SubjectId = "K||1234"
+	
+	Set MessageRepository = ##class(vhTest.Mock.AX.AifMessage.MessageRepository).%New()
+	Do MessageRepository.IndienMethodCall("GeefViaID",MessageID).DanReturn(AifMessage)
+		
+	Set Envelope = ##class(AXaif.Message.Envelope).%New()
+	Set Envelope.Header.RequestMessageId = MessageID
+	Set Envelope.Body.MessageParts.Fault.Code = "EenTotaalOnbekendeErrorCode"
+
+	Set GeneratorMock = ##class(vhTest.Mock.AX.Uitgaand.common.impl.AifGenerator).%New()
+	Do GeneratorMock.VerwachtMethodCall("Generate",$$$ElkeWaarde).ExactAantalKeer(0)
+
+	try {
+		Set UpdaterPart2 = ##class(AXimpl.AifMessage.EventHandler.CustomerUpdaterPart2).%New(MessageRepository, GeneratorMock)
+		Do UpdaterPart2.Verwerk(Envelope)
+		Do ..Fail("Er was een exceptie verwacht")
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch(##class(AXimpl.AifMessage.Exceptions.CustomerUpdatePart2UnknownFaultCodeException).%ClassName(1))
+		do $$$AssertEquals(Exception.GeefOmschrijving(),"Customer update, unknown faultcode : 'EenTotaalOnbekendeErrorCode'")
+	}		
+	
+	Do GeneratorMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXimpl/AifMessage/EventHandler/CustomerUpdaterPart2.cls.xml
===================================================================
diff -u -r35458 -r35462
--- AXimpl/AifMessage/EventHandler/CustomerUpdaterPart2.cls.xml	(.../CustomerUpdaterPart2.cls.xml)	(revision 35458)
+++ AXimpl/AifMessage/EventHandler/CustomerUpdaterPart2.cls.xml	(.../CustomerUpdaterPart2.cls.xml)	(revision 35462)
@@ -3,13 +3,6 @@
 <Class name="AXimpl.AifMessage.EventHandler.CustomerUpdaterPart2">
 <Super>TECH.PubSub.EventHandler</Super>
 
-<Method name="StartVerwerking">
-<ClassMethod>1</ClassMethod>
-<FormalSpec>ResponseReceivedEvent:AX.AifMessage.event.AifResponseReceivedEvent</FormalSpec>
-<Implementation><![CDATA[	do ..%New().Verwerk(ResponseReceivedEvent.Data.Message)
-]]></Implementation>
-</Method>
-
 <Property name="MessageRepository">
 <Type>AX.AifMessage.MessageRepository</Type>
 <Private>1</Private>
@@ -20,6 +13,18 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ErrorFinder">
+<Type>AXimpl.AifMessage.ReponseErrorFinder</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="StartVerwerking">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>ResponseReceivedEvent:AX.AifMessage.event.AifResponseReceivedEvent</FormalSpec>
+<Implementation><![CDATA[	do ..%New().Verwerk(ResponseReceivedEvent.Data.Message)
+]]></Implementation>
+</Method>
+
 <Method name="%OnNew">
 <FormalSpec>MessageRepository:AX.AifMessage.MessageRepository,Generator:AX.Uitgaand.common.impl.AifGenerator</FormalSpec>
 <Private>1</Private>
@@ -29,6 +34,7 @@
 <Implementation><![CDATA[
 	Set ..MessageRepository = $$$Inject(MessageRepository, ##class(AXdata.AifMessage.MessageRepository).%New())
 	Set ..Generator = $$$Inject(Generator, ##class(AX.Uitgaand.common.impl.AifGenerator).%New())
+	Set ..ErrorFinder = ##class(AXimpl.AifMessage.ReponseErrorFinder).%New()
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -39,10 +45,28 @@
 	#dim AifMessage As AXdata.AifMessage.Message = ..MessageRepository.GeefViaID(Envelope.Header.RequestMessageId)
 	
 	if (AifMessage.Command = "Customer/UpdatePart1") {
-		Do:(Envelope.Body.MessageParts.Fault.Code = "NoValidDocumentIdentified") ..Generator.Generate(##class(AXimpl.AifMessage.Request).%New("Customer/Create",AifMessage.SubjectId))
+		if ..ErrorFinder.HasError(Envelope) {
+			#dim Error As AXimpl.AifMessage.ResponseError = ..ErrorFinder.GetError(Envelope)
+			If (Error.Code = "NoValidDocumentIdentified") {
+				Do ..Generator.Generate(##class(AXimpl.AifMessage.Request).%New("Customer/Create",AifMessage.SubjectId))
+			} Else {
+				Do ..RaiseCustomerUpdatePart2UnknownFaultCodeException(Error,Envelope)
+				}
+		} else {
+			Do ..Generator.Generate(##class(AXimpl.AifMessage.Request).%New("Customer/UpdatePart2",AifMessage.SubjectId,Envelope))
+		}
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="RaiseCustomerUpdatePart2UnknownFaultCodeException">
+<FormalSpec>Error:AXimpl.AifMessage.ResponseError,Envelope:AXaif.Message.Envelope</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	set Exception = ##class(AXimpl.AifMessage.Exceptions.CustomerUpdatePart2UnknownFaultCodeException).%New(Error,Envelope)
+	do ##class(TECH.ExceptionHandler).Throw(Exception)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: AXimpl/AifMessage/Exceptions/CustomerUpdatePart2UnknownFaultCodeException.cls.xml
===================================================================
diff -u
--- AXimpl/AifMessage/Exceptions/CustomerUpdatePart2UnknownFaultCodeException.cls.xml	(revision 0)
+++ AXimpl/AifMessage/Exceptions/CustomerUpdatePart2UnknownFaultCodeException.cls.xml	(revision 35462)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.AifMessage.Exceptions.CustomerUpdatePart2UnknownFaultCodeException">
+<Super>TECH.Exceptions.Exception</Super>
+
+<Property name="Envelope">
+<Type>AXaif.Message.Envelope</Type>
+<Private>1</Private>
+</Property>
+
+<Property name="ResponseError">
+<Type>AXimpl.AifMessage.ResponseError</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>ResponseError:AXimpl.AifMessage.ResponseError,Envelope:AXaif.Message.Envelope</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	set ..Envelope = Envelope
+	set ..ResponseError = ResponseError
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="GeefOmschrijving">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit "Customer update, unknown faultcode : '"_..ResponseError.Code_"'"_$$$IfLength(..ResponseError.Detail,""," - ")
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>