diff --git a/configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerker.xml b/configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerker.xml
index 814fde7..2b64f5d 100644
--- a/configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerker.xml
+++ b/configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerker.xml
@@ -25,10 +25,11 @@
                 <Forward name="success" path="buildErrorMsg" />
             </PutInSessionPipe>
             <XsltPipe name="buildErrorMsg"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
+                styleSheetName="xsl/CreateErrorResponse.xsl"
                 getInputFromFixedValue="&lt;dummy/&gt;">
                 <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
                 <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
+                <Param name="corsaErrorMessage" type="STRING" xpathExpression="//LastError" sessionKey="corsaResponse"/>
                 <Param name="soapAction" value="http://bct.nl/About" />
                 <Forward name="success" path="EXCEPTION" />
             </XsltPipe>
@@ -97,25 +98,14 @@
             <WsdlXmlValidatorPipe name="ValidateConnectRequest" wsdl="Corsa72WS4j.xml"
                 soapBody="Connect" throwException="true"/>
 
+            <PutInSessionPipe name="storeConnectAction" sessionKey="RequestSoapAction" value="http://bct.nl/Connect"/>
+
             <SenderPipe name="sendToCorsa1">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/Connect" soap="false" />
                 <Forward name="success" path="Unwrapper1" />
-                <Forward name="exception" path="storeErrorResponse1" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
 
-            <PutInSessionPipe name="storeErrorResponse1">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildErrorMsg1" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildErrorMsg1"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/Connect" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
-
             <SoapWrapperPipe name="Unwrapper1" direction="UNWRAP" removeOutputNamespaces="true">
                 <Forward name="success" path="ConnectionSuccessCheck" />
                 <Forward name="exception" path="EXCEPTION" />
@@ -144,23 +134,13 @@
             <WsdlXmlValidatorPipe name="ValidateQueryRequest" wsdl="Corsa72WS4j.xml"
                 soapBody="QueryExecute" throwException="true"/>
 
+            <PutInSessionPipe name="storeQueryExecuteAction" sessionKey="RequestSoapAction" value="http://bct.nl/QueryExecute"/>
+
             <SenderPipe name="sendQueryToCorsa">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/QueryExecute" soap="false" />
                 <Forward name="success" path="UnwrapQueryResponse" />
-                <Forward name="exception" path="storeQueryErrorResponse" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
-            <PutInSessionPipe name="storeQueryErrorResponse">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildQueryErrorMsg" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildQueryErrorMsg"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/QueryExecute" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
 
             <SoapWrapperPipe name="UnwrapQueryResponse" direction="UNWRAP" removeOutputNamespaces="true">
                 <Forward name="success" path="RemoveResultTags" />
@@ -195,25 +175,15 @@
             </XsltPipe>
 
             <SoapWrapperPipe name="WrapCreatePersonRequest" storeResultInSessionKey="corsaRequest" />
+            
+            <PutInSessionPipe name="storeCreateMetaPersonAction" sessionKey="RequestSoapAction" value="http://bct.nl/CreateMetaPerson"/>
 
             <SenderPipe name="sendToCorsa2">
                 <WebServiceSender methodType="POST" url="${corsa.url}"
                     soapAction="http://bct.nl/CreateMetaPerson" soap="false" />
                 <Forward name="success" path="Unwrapper2" />
-                <Forward name="exception" path="storeErrorResponse2" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
-            <PutInSessionPipe name="storeErrorResponse2">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildErrorMsg2" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildErrorMsg2"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/CreateMetaPerson" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
 
             <SoapWrapperPipe name="Unwrapper2" direction="UNWRAP" removeOutputNamespaces="true"
                 storeResultInSessionKey="PersonData">
@@ -242,25 +212,14 @@
             <WsdlXmlValidatorPipe name="ValidateCreateMetaDocumentRequest" wsdl="Corsa72WS4j.xml"
                 soapBody="CreateMetaDocument" throwException="true"/>
 
+            <PutInSessionPipe name="storeCreateMetaDocumentAction" sessionKey="RequestSoapAction" value="http://bct.nl/CreateMetaDocument"/>
+            
             <SenderPipe name="sendToCorsa3">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/CreateMetaDocument" soap="false" />
                 <Forward name="success" path="UnwrapAndStoreDocumentDetails" />
-                <Forward name="exception" path="storeErrorResponse3" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
 
-            <PutInSessionPipe name="storeErrorResponse3">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildErrorMsg3" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildErrorMsg3"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/CreateMetaDocument" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
-
             <SoapWrapperPipe name="UnwrapAndStoreDocumentDetails" direction="UNWRAP" removeOutputNamespaces="true" storeResultInSessionKey="DocumentDetails"/>
             
             <XmlSwitchPipe
@@ -279,25 +238,14 @@
             <WsdlXmlValidatorPipe name="ValidateCreateFileVersionRequest" wsdl="Corsa72WS4j.xml"
                 soapBody="CreateFileVersion" throwException="true"/>
 
+            <PutInSessionPipe name="storeCreateFileVersionAction" sessionKey="RequestSoapAction" value="http://bct.nl/CreateFileVersion"/>
+
             <SenderPipe name="sendToCorsa4">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/CreateFileVersion" soap="false" />
                 <Forward name="success" path="RemoveXMLDeclaration" />
-                <Forward name="exception" path="storeErrorResponse4" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
 
-            <PutInSessionPipe name="storeErrorResponse4">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildErrorMsg4" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildErrorMsg4"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/CreateFileVersion" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
-
             <XsltPipe name="RemoveXMLDeclaration" omitXmlDeclaration="true" handleLexicalEvents="true" styleSheetName="xsl/Response2NoXML.xsl"/>
 
             <SoapWrapperPipe name="WrapResult" removeOutputNamespaces="true"  storeResultInSessionKey="FileVersionDetails"/>
@@ -309,25 +257,14 @@
             <WsdlXmlValidatorPipe name="ValidateDisconnectRequest" wsdl="Corsa72WS4j.xml"
                 soapBody="Disconnect" throwException="true"/>
 
+            <PutInSessionPipe name="storeDisconnectAction" sessionKey="RequestSoapAction" value="http://bct.nl/Disconnect"/>
+
             <SenderPipe name="SendDisconnectRequest">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/Disconnect" soap="false" />
                 <Forward name="success" path="UnwrapDisconnectResponse" />
-                <Forward name="exception" path="storeDisconnectErrorResponse" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
 
-            <PutInSessionPipe name="storeDisconnectErrorResponse">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildDisconnectErrorMsg" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildDisconnectErrorMsg"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/Disconnect" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
-
             <SoapWrapperPipe name="UnwrapDisconnectResponse" direction="UNWRAP" removeOutputNamespaces="true">
                 <Forward name="success" path="DisconnectSuccessCheck" />
                 <Forward name="exception" path="EXCEPTION" />
@@ -353,7 +290,24 @@
                 <Param name= "STOREDATE" sessionKey="StoreDate"/>
             </SenderPipe>
 
-            <EchoPipe name="ReturnResult" getInputFromSessionKey="FileVersionDetails"/>
+            <EchoPipe name="ReturnResult" getInputFromSessionKey="FileVersionDetails">
+                <Forward name="success" path="SUCCESS" />
+            </EchoPipe>
+
+            <PutInSessionPipe name="storeErrorResponse">
+                <Param name="corsaResponse" />
+                <Forward name="success" path="buildErrorMsg" />
+            </PutInSessionPipe>
+
+            <XsltPipe name="buildErrorMsg"
+                styleSheetName="xsl/CreateErrorResponse.xsl"
+                getInputFromFixedValue="&lt;dummy/&gt;">
+                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
+                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
+                <Param name="corsaErrorMessage" type="STRING" xpathExpression="//LastError" sessionKey="corsaResponse"/>
+                <Param name="soapAction" sessionKey="RequestSoapAction"/>
+                <Forward name="success" path="EXCEPTION" />
+            </XsltPipe>
         </Pipeline>
     </Adapter>
 
@@ -377,25 +331,14 @@
 
             <SoapWrapperPipe name="WrapConnectRequest" soapNamespace="http://www.w3.org/2003/05/soap-envelope" storeResultInSessionKey="corsaRequest"/>
 
+            <PutInSessionPipe name="storeConnectAction" sessionKey="RequestSoapAction" value="http://bct.nl/Connect"/>
+
             <SenderPipe name="sendToCorsa1">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/Connect" soap="false" />
                 <Forward name="success" path="Unwrapper1" />
-                <Forward name="exception" path="storeErrorResponse1" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
 
-            <PutInSessionPipe name="storeErrorResponse1">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildErrorMsg1" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildErrorMsg1"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/Connect" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
-
             <SoapWrapperPipe name="Unwrapper1" direction="UNWRAP"  removeOutputNamespaces="true">
                 <Forward name="success" path="ConnectionSuccessCheck" />
                 <Forward name="exception" path="EXCEPTION" />
@@ -440,25 +383,14 @@
 
             <SoapWrapperPipe name="WrapCreateMetaDocumentBijlageRequest" storeResultInSessionKey="corsaRequest"/>
 
+            <PutInSessionPipe name="storeCreateMetaDocumentAction" sessionKey="RequestSoapAction" value="http://bct.nl/CreateMetaDocument"/>
+
             <SenderPipe name="sendToCorsa5">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/CreateMetaDocument" soap="false" />
                 <Forward name="success" path="Wrapper5" />
-                <Forward name="exception" path="storeErrorResponse5" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
 
-            <PutInSessionPipe name="storeErrorResponse5">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildErrorMsg5" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildErrorMsg5"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/CreateMetaDocument" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
-
             <SoapWrapperPipe name="Wrapper5" removeOutputNamespaces="true" storeResultInSessionKey="DocumentForBijlage">
                 <Forward name="success" path="DocumentForBijlageCheck" />
                 <Forward name="exception" path="EXCEPTION" />
@@ -476,30 +408,14 @@
                 <Param name="DocumentID" xpathExpression="//CreateMetaDocumentResponse/NewObjectID" sessionKey="DocumentForBijlage"/>
             </XsltPipe>
 
-            <!-- <SoapWrapperPipe name="WrapCreateFileVersionRequest" soapNamespace="http://www.w3.org/2003/05/soap-envelope"/> -->
-
-            <!-- <WsdlXmlValidatorPipe name="ValidateCreateFileVersionRequest" wsdl="Corsa72WS4j.xml"
-                soapBody="CreateFileVersion" throwException="true"/> -->
+            <PutInSessionPipe name="storeCreateFileVersionAction" sessionKey="RequestSoapAction" value="http://bct.nl/CreateFileVersion"/>
 
             <SenderPipe name="sendToCorsa6">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/CreateFileVersion" soap="false" />
                 <Forward name="success" path="Wrapper6" />
-                <Forward name="exception" path="storeErrorResponse6" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
 
-            <PutInSessionPipe name="storeErrorResponse6">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildErrorMsg6" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildErrorMsg6"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/CreateFileVersion" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
-
             <SoapWrapperPipe name="Wrapper6" removeOutputNamespaces="true">
                 <Forward name="success" path="ConvertToModObjectRelation" />
                 <Forward name="exception" path="EXCEPTION" />
@@ -513,28 +429,14 @@
             <SoapWrapperPipe name="WrapModObjectRelationRequest" soapNamespace="http://www.w3.org/2003/05/soap-envelope"
                 storeResultInSessionKey="corsaRequest"/>
 
-            <!-- <WsdlXmlValidatorPipe name="ValidateModObjectRelationRequest" wsdl="Corsa72WS4j.xml"
-                soapBody="ModObjectRelation" throwException="true"/> -->
+            <PutInSessionPipe name="storeModObjectRelationAction" sessionKey="RequestSoapAction" value="http://bct.nl/ModObjectRelation"/>
 
             <SenderPipe name="sendToCorsa7">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/ModObjectRelation" soap="false" />
                 <Forward name="success" path="ConvertToBijlageResponse" />
-                <Forward name="exception" path="storeErrorResponse7" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
 
-            <PutInSessionPipe name="storeErrorResponse7">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildErrorMsg7" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildErrorMsg7"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/ModObjectRelation" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
-
             <SoapWrapperPipe name="UnwrapModObjectRelationRequest" direction="UNWRAP"/>
 
             <XsltPipe name="ConvertToBijlageResponse" styleSheetName="xsl/Response2Bijlage.xsl" omitXmlDeclaration="true">
@@ -550,25 +452,14 @@
             <WsdlXmlValidatorPipe name="ValidateDisconnectRequest" wsdl="Corsa72WS4j.xml"
                 soapBody="Disconnect" throwException="true"/>
 
+            <PutInSessionPipe name="storeDisconnectAction" sessionKey="RequestSoapAction" value="http://bct.nl/Disconnect"/>
+
             <SenderPipe name="SendDisconnectRequest">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/Disconnect" soap="false" />
                 <Forward name="success" path="UnwrapDisconnectResponse" />
-                <Forward name="exception" path="storeDisconnectErrorResponse" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
 
-            <PutInSessionPipe name="storeDisconnectErrorResponse">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildDisconnectErrorMsg" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildDisconnectErrorMsg"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/Disconnect" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
-
             <SoapWrapperPipe name="UnwrapDisconnectResponse" direction="UNWRAP" removeOutputNamespaces="true">
                 <Forward name="success" path="DisconnectSuccessCheck" />
                 <Forward name="exception" path="EXCEPTION" />
@@ -581,7 +472,24 @@
                 <Forward name="false" path="EXCEPTION" />
             </XmlSwitchPipe>
 
-            <EchoPipe name="ReturnResult" getInputFromSessionKey="BijlageResults"/>
+            <EchoPipe name="ReturnResult" getInputFromSessionKey="BijlageResults">
+                <Forward name="success" path="SUCCESS" />
+            </EchoPipe>
+
+            <PutInSessionPipe name="storeErrorResponse">
+                <Param name="corsaResponse" />
+                <Forward name="success" path="buildErrorMsg" />
+            </PutInSessionPipe>
+
+            <XsltPipe name="buildErrorMsg"
+                styleSheetName="xsl/CreateErrorResponse.xsl"
+                getInputFromFixedValue="&lt;dummy/&gt;">
+                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
+                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
+                <Param name="corsaErrorMessage" type="STRING" xpathExpression="//LastError" sessionKey="corsaResponse"/>
+                <Param name="soapAction" sessionKey="RequestSoapAction"/>
+                <Forward name="success" path="EXCEPTION" />
+            </XsltPipe>
         </Pipeline>
     </Adapter>
 
@@ -611,25 +519,14 @@
             <WsdlXmlValidatorPipe name="ValidateConnectRequest" wsdl="Corsa72WS4j.xml"
                 soapBody="Connect" throwException="true"/>
 
+            <PutInSessionPipe name="storeConnectAction" sessionKey="RequestSoapAction" value="http://bct.nl/Connect"/>
+
             <SenderPipe name="sendToCorsa1">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/Connect" soap="false" />
                 <Forward name="success" path="Unwrapper1" />
-                <Forward name="exception" path="storeErrorResponse1" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
 
-            <PutInSessionPipe name="storeErrorResponse1">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildErrorMsg1" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildErrorMsg1"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/Connect" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
-
             <SoapWrapperPipe name="Unwrapper1" direction="UNWRAP" removeOutputNamespaces="true">
                 <Forward name="success" path="ConnectionSuccessCheck" />
                 <Forward name="exception" path="EXCEPTION" />
@@ -658,23 +555,13 @@
             <WsdlXmlValidatorPipe name="ValidateQueryRequest" wsdl="Corsa72WS4j.xml"
                 soapBody="QueryExecute" throwException="true"/>
 
+            <PutInSessionPipe name="storeQueryExecuteAction" sessionKey="RequestSoapAction" value="http://bct.nl/QueryExecute"/>
+
             <SenderPipe name="sendQueryToCorsa">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/QueryExecute" soap="false" />
                 <Forward name="success" path="UnwrapQueryResponse" />
-                <Forward name="exception" path="storeQueryErrorResponse" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
-            <PutInSessionPipe name="storeQueryErrorResponse">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildQueryErrorMsg" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildQueryErrorMsg"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/QueryExecute" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
 
             <SoapWrapperPipe name="UnwrapQueryResponse" direction="UNWRAP" removeOutputNamespaces="true">
                 <Forward name="success" path="RemoveResultTags" />
@@ -710,24 +597,14 @@
 
             <SoapWrapperPipe name="WrapCreateCompanyRequest" storeResultInSessionKey="corsaRequest" />
 
+            <PutInSessionPipe name="storeCreateMetaOrganisationAction" sessionKey="RequestSoapAction" value="http://bct.nl/CreateMetaOrganisation"/>
+
             <SenderPipe name="sendToCorsa2">
                 <WebServiceSender methodType="POST" url="${corsa.url}"
                     soapAction="http://bct.nl/CreateMetaOrganisation" soap="false" />
                 <Forward name="success" path="Unwrapper2" />
-                <Forward name="exception" path="storeErrorResponse2" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
-            <PutInSessionPipe name="storeErrorResponse2">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildErrorMsg2" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildErrorMsg2"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/CreateMetaOrganisation" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
 
             <SoapWrapperPipe name="Unwrapper2" direction="UNWRAP" removeOutputNamespaces="true"
                 storeResultInSessionKey="PersonData">
@@ -756,23 +633,13 @@
             <WsdlXmlValidatorPipe name="ValidateCreateMetaDocumentRequest" wsdl="Corsa72WS4j.xml"
                 soapBody="CreateMetaDocument" throwException="true"/>
 
+            <PutInSessionPipe name="storeCreateMetaDocumentAction" sessionKey="RequestSoapAction" value="http://bct.nl/CreateMetaDocument"/>
+
             <SenderPipe name="sendToCorsa3">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/CreateMetaDocument" soap="false" />
                 <Forward name="success" path="UnwrapAndStoreDocumentDetails" />
-                <Forward name="exception" path="storeErrorResponse3" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
-            <PutInSessionPipe name="storeErrorResponse3">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildErrorMsg3" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildErrorMsg3"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/CreateMetaDocument" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
 
             <SoapWrapperPipe name="UnwrapAndStoreDocumentDetails" direction="UNWRAP" removeOutputNamespaces="true" storeResultInSessionKey="DocumentDetails"/>
             
@@ -792,25 +659,14 @@
             <WsdlXmlValidatorPipe name="ValidateCreateFileVersionRequest" wsdl="Corsa72WS4j.xml"
                 soapBody="CreateFileVersion" throwException="true"/>
 
+            <PutInSessionPipe name="storeCreateFileVersionAction" sessionKey="RequestSoapAction" value="http://bct.nl/CreateFileVersion"/>
+
             <SenderPipe name="sendToCorsa4">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/CreateFileVersion" soap="false" />
                 <Forward name="success" path="RemoveXMLDeclaration" />
-                <Forward name="exception" path="storeErrorResponse4" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
 
-            <PutInSessionPipe name="storeErrorResponse4">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildErrorMsg4" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildErrorMsg4"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/CreateFileVersion" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
-
             <XsltPipe name="RemoveXMLDeclaration" omitXmlDeclaration="true" handleLexicalEvents="true" styleSheetName="xsl/Response2NoXMLCompany.xsl"/>
 
             <SoapWrapperPipe name="WrapResult" removeOutputNamespaces="true"  storeResultInSessionKey="FileVersionDetails"/>
@@ -822,25 +678,14 @@
             <WsdlXmlValidatorPipe name="ValidateDisconnectRequest" wsdl="Corsa72WS4j.xml"
                 soapBody="Disconnect" throwException="true"/>
 
+            <PutInSessionPipe name="storeDisconnectAction" sessionKey="RequestSoapAction" value="http://bct.nl/Disconnect"/>
+
             <SenderPipe name="SendDisconnectRequest">
                 <WebServiceSender methodType="POST" url="${corsa.url}" soapAction="http://bct.nl/Disconnect" soap="false" />
                 <Forward name="success" path="UnwrapDisconnectResponse" />
-                <Forward name="exception" path="storeDisconnectErrorResponse" />
+                <Forward name="exception" path="storeErrorResponse" />
             </SenderPipe>
 
-            <PutInSessionPipe name="storeDisconnectErrorResponse">
-                <Param name="corsaResponse" />
-                <Forward name="success" path="buildDisconnectErrorMsg" />
-            </PutInSessionPipe>
-            <XsltPipe name="buildDisconnectErrorMsg"
-                styleSheetName="xsl/ParseNegativeHttpResultNew.xsl"
-                getInputFromFixedValue="&lt;dummy/&gt;">
-                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
-                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
-                <Param name="soapAction" value="http://bct.nl/Disconnect" />
-                <Forward name="success" path="EXCEPTION" />
-            </XsltPipe>
-
             <SoapWrapperPipe name="UnwrapDisconnectResponse" direction="UNWRAP" removeOutputNamespaces="true">
                 <Forward name="success" path="DisconnectSuccessCheck" />
                 <Forward name="exception" path="EXCEPTION" />
@@ -866,7 +711,24 @@
                 <Param name= "STOREDATE" sessionKey="StoreDate"/>
             </SenderPipe>
 
-            <EchoPipe name="ReturnResult" getInputFromSessionKey="FileVersionDetails"/>
+            <EchoPipe name="ReturnResult" getInputFromSessionKey="FileVersionDetails">
+                <Forward name="success" path="SUCCESS" />
+            </EchoPipe>
+
+            <PutInSessionPipe name="storeErrorResponse">
+                <Param name="corsaResponse" />
+                <Forward name="success" path="buildErrorMsg" />
+            </PutInSessionPipe>
+
+            <XsltPipe name="buildErrorMsg"
+                styleSheetName="xsl/CreateErrorResponse.xsl"
+                getInputFromFixedValue="&lt;dummy/&gt;">
+                <Param name="corsaRequest" type="STRING" sessionKey="corsaRequest" />
+                <Param name="corsaResponse" type="STRING" sessionKey="corsaResponse" />
+                <Param name="corsaErrorMessage" type="STRING" xpathExpression="//LastError" sessionKey="corsaResponse"/>
+                <Param name="soapAction" sessionKey="RequestSoapAction"/>
+                <Forward name="success" path="EXCEPTION" />
+            </XsltPipe>
         </Pipeline>
     </Adapter>
 
diff --git a/configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerkerDispatcher.xml b/configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerkerDispatcher.xml
index af41b10..4f14ad5 100644
--- a/configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerkerDispatcher.xml
+++ b/configurations/WebformulierenVerwerker/Configuration_WebformulierenVerwerkerDispatcher.xml
@@ -48,7 +48,7 @@ Attribuut name is nodig om een zinnige operation name=... te krijgen in de WSDL
             
             <SoapWrapperPipe name="Unwrapper" direction="UNWRAP" removeOutputNamespaces="true">
                 <Forward name="success" path="CheckOperation" />
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="SoapWrapper" />
             </SoapWrapperPipe>
             
              <XmlSwitchPipe
@@ -89,7 +89,7 @@ Attribuut name is nodig om een zinnige operation name=... te krijgen in de WSDL
                     javaListener="VersionAction">
                 </IbisLocalSender>
                 <Forward name="success" path="SUCCESS" />
-                <Forward name="exception" path="BackEndError" />
+                <Forward name="exception" path="SoapWrapper" />
             </SenderPipe>
 
             <SenderPipe
@@ -99,7 +99,7 @@ Attribuut name is nodig om een zinnige operation name=... te krijgen in de WSDL
                     javaListener="opslaanInkNatuurlijkPersoon">
                 </IbisLocalSender>
                 <Forward name="success" path="SUCCESS" />
-                <Forward name="exception" path="WrapFo03ResponseNew" />
+                <Forward name="exception" path="SoapWrapper" />
             </SenderPipe>
             
             <SenderPipe
@@ -109,14 +109,14 @@ Attribuut name is nodig om een zinnige operation name=... te krijgen in de WSDL
                     javaListener="opslaanInkNietNatuurlijkPersoon">
                 </IbisLocalSender>
                 <Forward name="success" path="SUCCESS" />
-                <Forward name="exception" path="WrapFo03ResponseNew" />
+                <Forward name="exception" path="SoapWrapper" />
             </SenderPipe>
 
             <!-- OperationChecker adds a few random variables on top of the message.
             To mitigate this, we get the originalMessage and unwrap it. -->
             <SoapWrapperPipe name="UnwrapBijlageRequest" direction="UNWRAP" removeOutputNamespaces="true" getInputFromSessionKey="originalMessage">
                 <Forward name="success" path="CallopslaanBijlage" />
-                <Forward name="exception" path="EXCEPTION" />
+                <Forward name="exception" path="SoapWrapper" />
             </SoapWrapperPipe>
 
             <SenderPipe
@@ -126,7 +126,7 @@ Attribuut name is nodig om een zinnige operation name=... te krijgen in de WSDL
                     javaListener="opslaanBijlage">
                 </IbisLocalSender>
                 <Forward name="success" path="SUCCESS" />
-                <Forward name="exception" path="WrapFo03ResponseNew" />
+                <Forward name="exception" path="SoapWrapper" />
             </SenderPipe>
 
             <SenderPipe
@@ -136,33 +136,12 @@ Attribuut name is nodig om een zinnige operation name=... te krijgen in de WSDL
                     javaListener="InfoAction">
                 </IbisLocalSender>
                 <Forward name="success" path="SUCCESS" />
-                <Forward name="exception" path="WrapFo03ResponseNew" />
+                <Forward name="exception" path="SoapWrapper" />
             </SenderPipe>
 
-            <SoapWrapperPipe
-                name="WrapFo03ResponseNew"
-                soapBodyStyleSheet="xsl/CreateFo03ResponseNew.xslt"
-            >
-                <Forward name="success" path="SUCCESS" />
-            </SoapWrapperPipe>
-
-            <PutInSessionPipe name="BackEndError" unlessSessionKey="errorCode">
-                <Param name="errorCode" styleSheetName="xsl/BackEndError.xsl" />
-                <Param name="errorReason" xpathExpression="/error/reason"/>
-                <Param name="errorDetailText" xpathExpression="concat(/error/code, ' ', /error/reason, ' ', /error/details)"/>
-                <Forward name="success" path="WrapFo03Response" />
-            </PutInSessionPipe>
-
-            <SoapWrapperPipe
-                name="WrapFo03Response"
-                soapBodyStyleSheet="xsl/CreateFo03Response.xslt"
-            >
-                <Param name="errorCode" sessionKey="errorCode" />
-                <Param name="errorReason" sessionKey="errorReason"/>
-                <Param name="errorDetailText" sessionKey="errorDetailText"/>
-                <Forward name="success" path="SUCCESS" />
+            <SoapWrapperPipe name="SoapWrapper">
+                <Forward name="success" path="EXCEPTION" />
             </SoapWrapperPipe>
-
         </Pipeline>
     </Adapter>
 </Module>
\ No newline at end of file
diff --git a/configurations/WebformulierenVerwerker/StageSpecifics_LOC.properties b/configurations/WebformulierenVerwerker/StageSpecifics_LOC.properties
index 3caae38..453517c 100644
--- a/configurations/WebformulierenVerwerker/StageSpecifics_LOC.properties
+++ b/configurations/WebformulierenVerwerker/StageSpecifics_LOC.properties
@@ -1,4 +1,4 @@
 # Localhost URL so testing can be done with the SoapUI Mockservice.
 corsa.url=http://localhost:8080/
 
-stub4testtool.configuration=true
+stub4testtool.configuration=false
diff --git a/configurations/WebformulierenVerwerker/xsl/CreateErrorResponse.xsl b/configurations/WebformulierenVerwerker/xsl/CreateErrorResponse.xsl
new file mode 100644
index 0000000..6166920
--- /dev/null
+++ b/configurations/WebformulierenVerwerker/xsl/CreateErrorResponse.xsl
@@ -0,0 +1,33 @@
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+    xmlns:xs="http://www.w3.org/2001/XMLSchema" version="2.0"
+    xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/">
+    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes" />
+    <xsl:param name="corsaRequest" select="''" as="xs:string" />
+    <xsl:param name="corsaResponse" select="''" as="xs:string" />
+    <xsl:param name="soapAction" select="''" as="xs:string" />
+    <xsl:param name="corsaErrorMessage" as="xs:string" />
+
+    <xsl:template match="/">
+        <Fault>
+            <faultcode>SOAP-ENV:Server</faultcode>
+            <faultstring>
+                <xsl:value-of select="$corsaErrorMessage" />
+            </faultstring>
+            <detail>
+                <xsl:value-of
+                    select="
+                    concat(
+                        concat(
+                            concat(
+                                concat(codepoints-to-string(10),'Soap Action: '), 
+                            $soapAction),
+                            concat(
+                                concat(codepoints-to-string(10),'Request: '),
+                            $corsaRequest)),
+                            concat(
+                                concat(codepoints-to-string(10),'Response: '),
+                            $corsaResponse))" />
+            </detail>
+        </Fault>
+    </xsl:template>
+</xsl:stylesheet>
\ No newline at end of file
diff --git a/configurations/WebformulierenVerwerker/xsl/CreateFo03Response.xslt b/configurations/WebformulierenVerwerker/xsl/CreateFo03Response.xslt
deleted file mode 100644
index 2b2e8ae..0000000
--- a/configurations/WebformulierenVerwerker/xsl/CreateFo03Response.xslt
+++ /dev/null
@@ -1,25 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-    xmlns:StUF="http://www.egem.nl/StUF/StUF0301"
-    xmlns:ZKN="http://www.egem.nl/StUF/sector/zkn/0310" version="2.0"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema">
-    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" />
-    <xsl:param name="errorCode" select="''" as="xs:string" />
-    <xsl:param name="errorMessage" select="''" as="xs:string" />
-
-    <xsl:template match="/">
-        <SOAP-ENV:Envelope
-            xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-            xmlns:xsi="http://www.w3.org/1999/XMLSchema-instance"
-            xmlns:xsd="http://www.w3.org/1999/XMLSchema">
-            <SOAP-ENV:Body>
-                <SOAP-ENV:Fault>
-                    <faultcode><xsl:value-of select="$errorCode" /></faultcode>
-            <faultstring>
-                <xsl:value-of select="$errorMessage" />
-            </faultstring>
-                </SOAP-ENV:Fault>
-            </SOAP-ENV:Body>
-        </SOAP-ENV:Envelope>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/configurations/WebformulierenVerwerker/xsl/CreateFo03ResponseNew.xslt b/configurations/WebformulierenVerwerker/xsl/CreateFo03ResponseNew.xslt
deleted file mode 100644
index b8b1603..0000000
--- a/configurations/WebformulierenVerwerker/xsl/CreateFo03ResponseNew.xslt
+++ /dev/null
@@ -1,15 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
-    xmlns:SOAP-ENV="http://schemas.xmlsoap.org/soap/envelope/"
-    xmlns:xs="http://www.w3.org/2001/XMLSchema"
-    version="2.0">
-    <xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" />
-
-    <xsl:template match="/">
-        <SOAP-ENV:Fault>
-            <faultcode>SOAP-ENV:Server</faultcode>
-            <faultstring>
-                <xsl:value-of select="concat(concat(concat(concat(concat('SOAP action: ', error/soapAction), ' Response: ' ), error/corsaResponse), ' Request: '), /error/corsaRequest)" />
-            </faultstring>
-        </SOAP-ENV:Fault>
-    </xsl:template>
-</xsl:stylesheet>
\ No newline at end of file
diff --git a/configurations/WebformulierenVerwerker/xsl/ParseNegativeHttpResult.xsl b/configurations/WebformulierenVerwerker/xsl/ParseNegativeHttpResult.xsl
deleted file mode 100644
index 8c872eb..0000000
--- a/configurations/WebformulierenVerwerker/xsl/ParseNegativeHttpResult.xsl
+++ /dev/null
@@ -1,38 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="2.0">
-	<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/>
-    <xsl:param name="senderPipeName" select="''" as="xs:string" />
-
-    <xsl:template match="/">
-        <error>
-            <xsl:choose>
-                <xsl:when test="root/status=400">
-                    <code>ClientError</code>
-                    <reason>400 Bad Request </reason>
-                </xsl:when>
-                <xsl:when test="root/status=401">
-                    <code>ClientError</code>
-                    <reason>401 Unauthorized </reason>
-                </xsl:when>
-                <xsl:when test="root/status=403">
-                    <code>ClientError</code>
-                    <reason>403 Forbidden </reason>
-                </xsl:when>
-                <xsl:when test="root/status=404">
-                    <code>ClientError</code>
-                    <reason>404 Not Found </reason>
-                </xsl:when>
-                <xsl:when test="root/status=500">
-                    <code>ServerError</code>
-                    <reason>500 Internal Server Error </reason>
-                </xsl:when>
-                <xsl:otherwise>
-                    <code>ServerError</code>
-                    <reason>Some negative response </reason>
-                </xsl:otherwise>
-            </xsl:choose>
-            <details>
-                <xsl:value-of select="concat(/root/code, ' ', /root/title, ' ', /root/status, ' ', /root/detail)" />
-            </details>
-        </error>
-    </xsl:template>
-</xsl:stylesheet>
diff --git a/configurations/WebformulierenVerwerker/xsl/ParseNegativeHttpResultNew.xsl b/configurations/WebformulierenVerwerker/xsl/ParseNegativeHttpResultNew.xsl
deleted file mode 100644
index a78a584..0000000
--- a/configurations/WebformulierenVerwerker/xsl/ParseNegativeHttpResultNew.xsl
+++ /dev/null
@@ -1,14 +0,0 @@
-<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" xmlns:xs="http://www.w3.org/2001/XMLSchema" version="2.0">
-	<xsl:output method="xml" version="1.0" encoding="UTF-8" indent="yes" omit-xml-declaration="yes"/>
-    <xsl:param name="corsaRequest" select="''" as="xs:string" />
-    <xsl:param name="corsaResponse" select="''" as="xs:string" />
-    <xsl:param name="soapAction" select="''" as="xs:string" />
-
-    <xsl:template match="/">
-        <error>
-            <soapAction><xsl:value-of select="$soapAction" /></soapAction>
-            <corsaRequest><xsl:value-of select="$corsaRequest" /></corsaRequest>
-            <corsaResponse><xsl:value-of select="$corsaResponse" /></corsaResponse>
-        </error>
-    </xsl:template>
-</xsl:stylesheet>