Index: TECH/Context/RuntimeContext.cls.xml
===================================================================
diff -u -r966 -r1806
--- TECH/Context/RuntimeContext.cls.xml	(.../RuntimeContext.cls.xml)	(revision 966)
+++ TECH/Context/RuntimeContext.cls.xml	(.../RuntimeContext.cls.xml)	(revision 1806)
@@ -53,6 +53,17 @@
 <Private>1</Private>
 </Property>
 
+<Method name="%OnNew">
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<PublicList>QU</PublicList>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Do ..ZetGebruikerID(..BuildGebruikerID($get(QU(1),0)))
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
 <Method name="Instance">
 <ClassMethod>1</ClassMethod>
 <ReturnType>TECH.Context.RuntimeContext</ReturnType>
@@ -72,6 +83,14 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BuildGebruikerID">
+<FormalSpec>vhUserId:%String="0"</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	quit "4682||"_vhUserId
+]]></Implementation>
+</Method>
+
 <Method name="ZetGebruikerID">
 <FormalSpec>GebruikerID:%String</FormalSpec>
 <Implementation><![CDATA[
@@ -82,7 +101,7 @@
 
 <Method name="GeefGebruikerID">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..GebruikerID
+<Implementation><![CDATA[	Quit $get(^||RuntimeContext("GebruikerID"),..BuildGebruikerID())
 ]]></Implementation>
 </Method>
 
@@ -249,17 +268,6 @@
 <Implementation><![CDATA[	quit ..Applicatie
 ]]></Implementation>
 </Method>
-
-<Method name="%OnNew">
-<Private>1</Private>
-<ProcedureBlock>1</ProcedureBlock>
-<PublicList>QU</PublicList>
-<ReturnType>%Status</ReturnType>
-<Implementation><![CDATA[
-	set ..GebruikerID = "4682||"_$get(QU(1),0)
-	Quit $$$OK
-]]></Implementation>
-</Method>
 </Class>
 
 
Index: vhLib/System.mac.rou
===================================================================
diff -u -r506 -r1806
--- vhLib/System.mac.rou	(.../System.mac.rou)	(revision 506)
+++ vhLib/System.mac.rou	(.../System.mac.rou)	(revision 1806)
@@ -47,19 +47,20 @@
 	Quit Txt
 	
 GetStackToString(Short,NoLastLevels)
- New loop,Body
+ New loop,Body,BodyString
+ set Body = ##class(%GlobalCharacterStream).%New()
  Set Short=$G(Short,0)
  Set QuitAtSource=$G(QuitAtSource,$C(0))
  Set NoLastLevels=$G(NoLastLevels,1)
- Set Body="" ;"Ecode: "_$ECODE
  Set $ECODE=""
  For loop=0:1:$STACK(-1)-NoLastLevels Quit:($STACK(loop,"MCODE")[QuitAtSource)  DO
  . If Short Do
- ..  Set Body=Body_$STACK(loop,"MCODE")_"     [PLACE: '"_$STACK(loop,"PLACE") _ "']"_$$$CRLF
+ ..  do Body.Write($STACK(loop,"MCODE")_"     [PLACE: '"_$STACK(loop,"PLACE") _ "']"_$$$CRLF)
  . Else  Do
- ..  Set Body=Body_$$$CRLF_"Context level: "_loop
- ..  Set Body=Body_$$$CRLF_"   - Context type  : "_$STACK(loop)
- ..  Set Body=Body_$$$CRLF_"   - Current place : "_$STACK(loop,"PLACE")
- ..  Set Body=Body_$$$CRLF_"   - Current source: "_$STACK(loop,"MCODE")
- Set Body=Body_$$$CRLF_$$$CRLF_$$GetJobInfo(1,"")
- Quit Body
+ ..  do Body.Write($$$CRLF_"Context level: "_loop)
+ ..  do Body.Write($$$CRLF_"   - Context type  : "_$STACK(loop))
+ ..  do Body.Write($$$CRLF_"   - Current place : "_$STACK(loop,"PLACE"))
+ ..  do Body.Write($$$CRLF_"   - Current source: "_$STACK(loop,"MCODE"))
+ Do Body.Write($$$CRLF_$$$CRLF_$$GetJobInfo(1,""))
+ Set BodyString = Body.Read(30000)
+ Quit BodyString