Index: UI/Utils/MAppLauncher/MainForm.cls.xml
===================================================================
diff -u -r31765 -r34141
--- UI/Utils/MAppLauncher/MainForm.cls.xml	(.../MainForm.cls.xml)	(revision 31765)
+++ UI/Utils/MAppLauncher/MainForm.cls.xml	(.../MainForm.cls.xml)	(revision 34141)
@@ -376,22 +376,37 @@
  s Sender=##class(%TMPersistent).GetObjOref($lg(Args,1))
  ;Beginning of user code
 
-#define IP4   $P(MApplication.GetClientIP(),".",4)
- Do ..GetIPComKey()
- Do ..PrepareParams()
- Set ..AutoStart=(''$L(..ComKey))
- Set:(..#TestMode=1)&&($$$IP4=97) ..AutoStart=0   ; Test voor WV_W2K
- Do:('..AutoStart)||(..#TestMode=1) ..RebuildCtrls()
+	Set $ZTRAP = "OnErrorDesignFormShowMAppL"
+	Do dfsStartApplication
+	Set $ZTRAP = ""
 
- ;If ($$$IP4=97) Do  Quit
- ;. Do ..RebuildCtrls()
-
- Do:(..AutoStart) ..btnStartApplClick(.Args)
- Do:($L(..ComKey))&&(..#TestMode=0) ..btnOkClick(.Args)
-
  ;End of user code
  s Args=$lb(Sender)
  q
+	
+OnErrorDesignFormShowMAppL
+	Set $ZTRAP = ""
+	Set Exception = ##class(TECH.ExceptionHandler).Catch()
+	Do ##class(vhLib.Logger).%New("Makova Applic").ErrorMail("Makova Application Error",Exception.ToString())
+	Set Args=$LB(Sender)
+	Quit 
+
+dfsStartApplication
+	#define IP4   $P(MApplication.GetClientIP(),".",4)
+
+	Do ..GetIPComKey()
+	Do ..PrepareParams()
+	Set ..AutoStart=(''$L(..ComKey))
+	Set:(..#TestMode=1)&&($$$IP4=97) ..AutoStart=0   ; Test voor WV_W2K
+	Do:('..AutoStart)||(..#TestMode=1) ..RebuildCtrls()
+	
+	;If ($$$IP4=97) Do  Quit
+	;. Do ..RebuildCtrls()
+	
+	Do:(..AutoStart) ..btnStartApplClick(.Args)
+	Do:($L(..ComKey))&&(..#TestMode=0) ..btnOkClick(.Args)
+	
+	Quit
 ]]></Implementation>
 </Method>