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>