Index: vhLib/WebService.cls.xml
===================================================================
diff -u -r2798 -r2881
--- vhLib/WebService.cls.xml	(.../WebService.cls.xml)	(revision 2798)
+++ vhLib/WebService.cls.xml	(.../WebService.cls.xml)	(revision 2881)
@@ -44,28 +44,8 @@
 <FormalSpec>fault:%SOAP.Fault,status:%Status</FormalSpec>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	#define cvtHTML(%v)   $ZConvert(%v,"O","HTML")
-	If '$isObject($G(%ErrorObject)) && (fault.faultcode=$$$FAULTServer)
-	{ 
-		#dim SoapHandlerOpties As %String = ""
-		If ($Data(%Exception) && ($IsObject(%Exception)) && ('%Exception.StuurMailBijError())) Set SoapHandlerOpties = "NOMAIL"
-		Do ##class(TECH.Error.impl.ErrorHandler).Handler("SOAP Error",SoapHandlerOpties)
-	}
-	
-	If $isObject($G(%ErrorObject))
-	{ 
-		Set detail=$$$CRLF_"    <error xmlns='"_..#NAMESPACE_"' >"_$$$CRLF
-		Set detail=detail_"     <label>"_$$$cvtHTML(%ErrorObject.Label)_"</label>"_$$$CRLF
-		Set detail=detail_"     <text>"_$$$cvtHTML(%ErrorObject.ErrorCode)_"</text>"_$$$CRLF
-		Set:($L(%ErrorObject.UserText)) detail=detail_"     <usertext>"_$$$cvtHTML(%ErrorObject.UserText)_"</usertext>"_$$$CRLF
-		Set detail=detail_"     <zerror>"_$$$cvtHTML(%ErrorObject.ErrorCode2)_"</zerror>"_$$$CRLF
-		Set:%ErrorObject.Data'="" detail = detail_"     <data>"_%ErrorObject.Data_"</data>"_$$$CRLF
-		Set detail=detail_"     <remoteIP>"_$$$cvtHTML(%ErrorObject.RemoteIP)_"</remoteIP>"_$$$CRLF
-		Set detail=detail_"     <deviceInfo>"_$$$cvtHTML("device: "_%ErrorObject.Device_"  job: "_%ErrorObject.Job)_"</deviceInfo>"_$$$CRLF
-		Set detail=detail_"    </error>"_$$$CRLF
-
-		Set fault.detail=detail
-	}
+	Set WebServiceHelper = ##class(vhLib.WebServiceHelper).%New()
+	Do WebServiceHelper.OnInternalFault(.fault,.status,$classname(),..#NAMESPACE)
 ]]></Implementation>
 </Method>
 
@@ -89,9 +69,8 @@
 <ReturnType>%Boolean</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	#dim ClassName As %String = ..%ClassName(1)
 	Set WebServiceHelper = ##class(vhLib.WebServiceHelper).%New()
-	do WebServiceHelper.ProcessBody(.action,.requestBody,.responseBody,ClassName)	
+	Do WebServiceHelper.ProcessBody(.action,.requestBody,.responseBody,$classname())	
 	Quit 0
 ]]></Implementation>
 </Method>
Index: vhLib/WebServiceHelper.cls.xml
===================================================================
diff -u -r1301 -r2881
--- vhLib/WebServiceHelper.cls.xml	(.../WebServiceHelper.cls.xml)	(revision 1301)
+++ vhLib/WebServiceHelper.cls.xml	(.../WebServiceHelper.cls.xml)	(revision 2881)
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Export generator="Cache" version="24">
 <Class name="vhLib.WebServiceHelper">
-<Super>%RegisteredObject</Super>
+<IncludeCode>%soap</IncludeCode>
+<Super>TECH.RegisteredObject</Super>
 
 <Property name="IO">
 <Type>TECH.IO</Type>
@@ -10,23 +11,23 @@
 
 <Method name="OnBeforeWriteSOAPMessage">
 <Implementation><![CDATA[
-		Set ..IO = ##class(TECH.IO).%New()
-		Do ..IO.Redirect()
+	Set ..IO = ##class(TECH.IO).%New()
+	Do ..IO.Redirect()
 ]]></Implementation>
 </Method>
 
 <Method name="OnAfterWriteSOAPMessage">
 <FormalSpec>ClassName:%String</FormalSpec>
 <Implementation><![CDATA[
-		Do ..IO.Reset()
-		#dim Stream As %FileCharacterStream = ..IO.GeefStream()
-		while 'Stream.AtEnd {
-			write Stream.Read()
-		}
-		#dim UitvoeringTijd As %Decimal = $$RestartTimer^vhLib()
-		Do ##class(vhLib.WebServiceLogger.LogService).LogStream(Stream,"OUT",ClassName)
-		Do ##class(vhLib.WebServiceLogger.LogService).LogUitvoeringTijd(ClassName,UitvoeringTijd)
-		Do ..IO.KuisOp()
+	Do ..IO.Reset()
+	#dim Stream As %FileCharacterStream = ..IO.GeefStream()
+	while 'Stream.AtEnd {
+		write Stream.Read()
+	}
+	#dim UitvoeringTijd As %Decimal = $$RestartTimer^vhLib()
+	Do ##class(vhLib.WebServiceLogger.LogService).LogStream(Stream,"OUT",ClassName)
+	Do ##class(vhLib.WebServiceLogger.LogService).LogUitvoeringTijd(ClassName,UitvoeringTijd)
+	Do ..IO.KuisOp()
 ]]></Implementation>
 </Method>
 
@@ -37,14 +38,46 @@
 	Do ##class(vhLib.WebServiceLogger.LogService).LogStream(requestBody,"IN",ClassName)
 	Try {
 		#dim Personality as %String = ##class(TECH.Context.RuntimeContext).Instance().GeefPersonalityID()
-	}Catch{		
+	} Catch{		
 		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch(##class(TECH.Exceptions.GeneralErrorException).%ClassName(1))
 		If Exception.GeefOmschrijving() = "Personality is niet opgezet."{
 			Do ##class(TECH.Context.RuntimeContext).Instance().ZetPersonalityID(##class(DOM.common.enu.Personality).VanHoecke())
 		}
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="OnInternalFault">
+<FormalSpec>fault:%SOAP.Fault,status:%Status,Classname:%String,Namespace:%String</FormalSpec>
+<Implementation><![CDATA[
+	#define cvtHTML(%v)   $ZConvert(%v,"O","HTML")
+	If '$isObject($G(%ErrorObject)) && (fault.faultcode=$$$FAULTServer) { 
+		#dim SoapHandlerOpties As %String = ""
+		If ($Data(%Exception) && ($IsObject(%Exception)) && ('%Exception.StuurMailBijError())) Set SoapHandlerOpties = "NOMAIL"
+		
+		#dim Webmethod As %String = %request.GetCgiEnv("HTTP_SOAPACTION")
+		Set Webmethod = $Piece($Piece(Webmethod,".",$length(Webmethod,".")),"""")
+		Set:(Webmethod="") Webmethod = $G(%request.Data("soap_method",1))   ; indien Webservice aangeroepen via csp-page (=testing) 
+		
+		Do ##class(TECH.Error.impl.ErrorHandler).Handler(Webmethod,SoapHandlerOpties)
+	}
+	
+	If $isObject($G(%ErrorObject)) { 
+		#dim detail As %String
+		Set detail=$$$CRLF_"    <error xmlns='"_Namespace_"' >"_$$$CRLF
+		Set detail=detail_"     <label>"_$$$cvtHTML(%ErrorObject.Label)_"</label>"_$$$CRLF
+		Set detail=detail_"     <text>"_$$$cvtHTML(%ErrorObject.ErrorCode)_"</text>"_$$$CRLF
+		Set:($L(%ErrorObject.UserText)) detail=detail_"     <usertext>"_$$$cvtHTML(%ErrorObject.UserText)_"</usertext>"_$$$CRLF
+		Set detail=detail_"     <zerror>"_$$$cvtHTML(%ErrorObject.ErrorCode2)_"</zerror>"_$$$CRLF
+		Set:%ErrorObject.Data'="" detail = detail_"     <data>"_%ErrorObject.Data_"</data>"_$$$CRLF
+		Set detail=detail_"     <remoteIP>"_$$$cvtHTML(%ErrorObject.RemoteIP)_"</remoteIP>"_$$$CRLF
+		Set detail=detail_"     <deviceInfo>"_$$$cvtHTML("device: "_%ErrorObject.Device_"  job: "_%ErrorObject.Job)_"</deviceInfo>"_$$$CRLF
+		Set detail=detail_"    </error>"_$$$CRLF
+
+		Set fault.detail=detail
+	}
+]]></Implementation>
+</Method>
 </Class>