Index: vhLib/System.mac.rou
===================================================================
diff -u -r486 -r506
--- vhLib/System.mac.rou	(.../System.mac.rou)	(revision 486)
+++ vhLib/System.mac.rou	(.../System.mac.rou)	(revision 506)
@@ -30,9 +30,20 @@
  //           Handig bij het versturen van bvb. mails met een error-melding
  // ==========================================================================================================================================
 GetJobInfo(blnMultiLine,Indent)
+	New Exception
 	Set Indent=$G(Indent),blnMultiLine=$G(blnMultiLine,1)
- 	Set Txt=Indent_"Device: "_$I_"  Job: "_$J
-	Set Txt=Txt_$S(blnMultiLine:$$$CRLF_Indent, 1:"  ")_"Server: "_##class(TECH.Context.RuntimeContext).Instance().GeefServerNaam()_"  NameSpace: "_$$$NSpace_$S(blnMultiLine:$$$CRLF, 1:"")
+ 	Set Txt="Device: "_$I_"  Job: "_$J
+	Set Txt=Txt_$S(blnMultiLine:$$$CRLF_Indent, 1:"  ")_"Server: "_##class(TECH.Context.RuntimeContext).Instance().GeefServerNaam()_"  NameSpace: "_##class(TECH.Context.RuntimeContext).Instance().GeefNamespace()
+	Try {
+		Set Txt=Txt_$S(blnMultiLine:$$$CRLF_Indent, 1:"  ")_"GebruikerID: "_##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerID()
+		Set Txt=Txt_$S(blnMultiLine:$$$CRLF_Indent, 1:"  ")_"GebruikerInitialen: "_##class(TECH.Context.RuntimeContext).Instance().GeefGebruikerInitialen()
+		Set Txt=Txt_$S(blnMultiLine:$$$CRLF_Indent, 1:"  ")_"ComputerNaam: "_##class(TECH.Context.RuntimeContext).Instance().GeefComputerNaam()
+	}Catch{
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Set Txt=Txt_$S(blnMultiLine:$$$CRLF_Indent, 1:"  ")_"Kon gebruiker data niet achterhalen : "_Exception.ToString()
+	}
+	Set Txt=Txt_$S(blnMultiLine:$$$CRLF, 1:"")
+	
 	Quit Txt
 	
 GetStackToString(Short,NoLastLevels)