Index: WS/EC/WebShopServer.cls.xml
===================================================================
diff -u -r1643 -r1761
--- WS/EC/WebShopServer.cls.xml	(.../WebShopServer.cls.xml)	(revision 1643)
+++ WS/EC/WebShopServer.cls.xml	(.../WebShopServer.cls.xml)	(revision 1761)
@@ -53,7 +53,9 @@
 <ClassMethod>1</ClassMethod>
 <ReturnType>%String</ReturnType>
 <WebMethod>1</WebMethod>
-<Implementation><![CDATA[	Quit 1_" - "_$$$Server_" - "_$$$NSpace_" - "_..%ClassName(1)
+<Implementation><![CDATA[
+	$$$WebServiceTrap
+	Quit 1_" - "_$$$Server_" - "_$$$NSpace_" - "_..%ClassName(1)
 ]]></Implementation>
 </Method>
 
@@ -66,7 +68,7 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	#Include BL.EC.Common
-
+	$$$WebServiceTrap
 	$$$blSession
 	Set Status=%blSession.ReInstateSession(SessionID)
 	Quit:$IsObject(Status) ""
@@ -96,7 +98,7 @@
 <Implementation><![CDATA[
 	
 	#Include BL.EC.Common
-
+	$$$WebServiceTrap
 	$$$blSession
 	Set Status=%blSession.ReInstateSession(SessionID)
 	Quit:$IsObject(Status) ""
@@ -125,7 +127,7 @@
 <Implementation><![CDATA[
 
    #Include BL.EC.Common
-
+	$$$WebServiceTrap
    $$$blSession
    Set Status=%blSession.ReInstateSession(SessionID)
    
@@ -334,7 +336,7 @@
 <ReturnType>BL.EC.pxDynaPlug</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	
+	$$$WebServiceTrap
 	;$$$TECHErrorTrapOn
 	
 	set Logger = ##class(BL.EC.DynaplugLogger).%New()
@@ -399,7 +401,7 @@
 <ReturnType>%String</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	;$$$WebServiceTrap
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"New","")
 	$$$blWebShop
@@ -420,7 +422,7 @@
 <ReturnType>BL.EC.pxStatus</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	;$$$WebServiceTrap
+	$$$WebServiceTrap
 	Set:$L($G(WebShopID)) WebShopID=$TR(WebShopID,".","") ; Nummer is geformateerd met duizend separator
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"SetFocus",WebShopID)
@@ -441,9 +443,10 @@
 <ReturnType>BL.EC.pxWebShop</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$WebServiceTrap
+	
 	Set WebShopID=$$$StripC0(WebShopID)
 
-	;$$$WebServiceTrap
 	Set:$L($G(WebShopID)) WebShopID=$TR(WebShopID,".","") ; Nummer is geformateerd met duizend separator
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"GetActueel",$S($G(WebShopID)="":%ECSession.WebShopID,1:WebShopID))
@@ -468,9 +471,7 @@
 <ReturnType>%String</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	
-	
-	;$$$WebServiceTrap
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"CopyOfferte",OfferteID)
 	$$$blWebShop
@@ -486,7 +487,6 @@
 <ReturnType>BL.EC.pxStatus</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-
 	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	Set LogText=%ECSession.WebShopID_"; GVO="_$G(GoedVoorOrder)
@@ -538,7 +538,6 @@
 <ReturnType>BL.EC.pxStatus</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	
 	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"GoedVoorOrder",%ECSession.WebShopID)
@@ -598,7 +597,7 @@
 <ReturnType>%Status</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	;$$$WebServiceTrap
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"DelLijn",%ECSession.WebShopID_"~"_LijnID)
 	$$$blWebShop
@@ -615,6 +614,7 @@
 <ReturnType>BL.EC.pxProductDtl</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	;$$$ControleToegang($$$tgWebShop,"GetProdQty",%ECSession.WebShopID_"~"_Product)
 	$$$blProduct
@@ -635,6 +635,7 @@
 <ReturnType>BL.EC.pxWizard</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"InitWizard",%ECSession.WebShopID_"~"_ToegangWizard_"~"_$G(Default))
 	$$$blWizard
@@ -651,6 +652,7 @@
 <ReturnType>BL.EC.pxWizard</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"ModifyWizard",%ECSession.WebShopID_"~"_Product_"~"_$G(Wizard))
 	$$$blWebShop
@@ -695,7 +697,7 @@
 <ReturnType>%Status</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	;$$$WebServiceTrap
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"AddProdLijn",%ECSession.WebShopID_"~"_$S($isObject($G(pxGAData)):pxGAData.%ClassName(),1:Product)_"~"_$G(Aantal))
 	$$$blWebShop
@@ -727,7 +729,7 @@
 <ReturnType>%Status</ReturnType>
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
-	;$$$WebServiceTrap
+	$$$WebServiceTrap
 	$$$ReInstateSession(SessionKey)
 	$$$ControleToegang($$$tgWebShop,"ModProdLijn",%ECSession.WebShopID_"~"_$S($isObject($G(pxGAData)):pxGAData.%ClassName(),1:$G(Product))_"~"_$G(Aantal))
 	$$$blWebShop