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>