Index: TECH/Context/RuntimeContext.cls.xml
===================================================================
diff -u -r14 -r62
--- TECH/Context/RuntimeContext.cls.xml	(.../RuntimeContext.cls.xml)	(revision 14)
+++ TECH/Context/RuntimeContext.cls.xml	(.../RuntimeContext.cls.xml)	(revision 62)
@@ -27,11 +27,6 @@
 <Parameter name="TRUNCATE" value="1"/>
 </Property>
 
-<Property name="GebruikerID">
-<Type>%String</Type>
-<Private>1</Private>
-</Property>
-
 <Method name="Instance">
 <ClassMethod>1</ClassMethod>
 <ReturnType>TECH.Context.RuntimeContext</ReturnType>
@@ -47,18 +42,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="ZetGebruikerID">
-<FormalSpec>GebruikerID:%String</FormalSpec>
-<Implementation><![CDATA[	Set ..GebruikerID = GebruikerID
-]]></Implementation>
-</Method>
-
-<Method name="GeefGebruikerID">
-<ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit ..GebruikerID
-]]></Implementation>
-</Method>
-
 <Method name="GeefGebruikerInitialen">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
@@ -78,6 +61,30 @@
 ]]></Implementation>
 </Method>
 
+<Method name="GeefIP">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim IP As %String = ""
+	If ($D(%request))
+	{	
+		Set IP = %request.GetCgiEnv("REMOTE_ADDR")
+	}
+	Else
+	{
+		Set IONaam = $I
+		If ($E(IONaam,1,5) = "|TNT|")
+		{
+			Set DeviceID = $P($E(IONaam,6,99),":",1)
+			If (DeviceID?3(1.3N1".")1.3N) // Controle op IP-formaat
+			{
+				Set IP = DeviceID
+			}
+		}
+	}
+	Quit IP
+]]></Implementation>
+</Method>
+
 <Method name="GeefComputerNaam">
 <Description>
 Werkt wanneer oproep via webservice of telnet binnenkomt binnen het netwerk.
@@ -86,58 +93,48 @@
 <Implementation><![CDATA[
 	If (..ComputerNaam = "")
 	{
-		Set IP = ""
-		Set ComputerNaam = ""
-		
-		If ($D(%request))
-		{	
-			Set IP = %request.GetCgiEnv("REMOTE_ADDR")
-		}
-		Else
+		Set IONaam = $I
+		If ($E(IONaam,1,5) = "|TNT|")
 		{
-			Set IONaam = $I
-			If ($E(IONaam,1,5) = "|TNT|")
+			Set DeviceID = $P($E(IONaam,6,99),":",1)
+			If (DeviceID'?3(1.3N1".")1.3N) // Controle op IP-formaat
 			{
-				Set DeviceID = $P($E(IONaam,6,99),":",1)
-				;if $zcvt(DeviceID,"U")="LOCALHOST" set DeviceID=$$$Server
-				If (DeviceID?3(1.3N1".")1.3N) // Controle op IP-formaat
-				{
-					Set IP = DeviceID
-				}
-				Else
-				{
-					Set ..ComputerNaam = DeviceID
-				}
+				Set ..ComputerNaam = DeviceID
 			}
 		}
-		// Als we enkel het IP kennen dan gaan we proberen de pc-naam op te zoeken
-		If (IP '= "")
+		
+		If (..ComputerNaam="")
 		{
-			Set FileName="PING"_$J_$$UPTRIMAN^vhRtn1(IP)
-			Set Exec="NSLOOKUP "_IP_" > c:\"_FileName  // ping vervangen door nslookup 
-			Set Ok=$ZF(-1,"NSLOOKUP "_IP_" > c:\"_FileName)
+			Set IP = ..GeefIP()
+			If (IP '= "")
+			{
+				Set FileName="PING"_$J_$$UPTRIMAN^vhRtn1(IP)
+				Set Exec="NSLOOKUP "_IP_" > c:\"_FileName  // ping vervangen door nslookup 
+				Set Ok=$ZF(-1,"NSLOOKUP "_IP_" > c:\"_FileName)
 			
-			Set Stream=##class(%FileCharacterStream).%New()
-			Set Stream.Filename="c:\"_FileName
+				Set Stream=##class(%FileCharacterStream).%New()
+				Set Stream.Filename="c:\"_FileName
 			
-			Do Stream.ReadLine()
-			Do Stream.ReadLine()
-			Do Stream.ReadLine()
-			Set ComputerNaamOutput = Stream.ReadLine()
+				Do Stream.ReadLine()
+				Do Stream.ReadLine()
+				Do Stream.ReadLine()
+				Set ComputerNaamOutput = Stream.ReadLine()
 			
-			Set PiecesIterator = ##class(TECH.PiecesIterator).%New(ComputerNaamOutput," ")
-			While (PiecesIterator.HasNext())
-			{
-				Set ..ComputerNaam = PiecesIterator.Next()
-			}
+				Set PiecesIterator = ##class(TECH.PiecesIterator).%New(ComputerNaamOutput," ")
+				While (PiecesIterator.HasNext())
+				{
+					Set ..ComputerNaam = PiecesIterator.Next()
+				}
 			
-			Set Stream = ""
+				Set Stream = ""
 			
-			Do ##class(%File).Delete("c:\"_FileName)
+				Do ##class(%File).Delete("c:\"_FileName)
+			}
 		}
+		
+		If ##class(TECH.StringUtils).ToUpper(..ComputerNaam)="LOCALHOST" Set ..ComputerNaam=$$$Server
 	}
 	
-	if $zcvt(..ComputerNaam,"U")="LOCALHOST" set ..ComputerNaam=$$$Server_".vanhoecke.be"
 	Quit ..ComputerNaam
 ]]></Implementation>
 </Method>
Index: TECH/ExceptionHandler.cls.xml
===================================================================
diff -u -r9 -r62
--- TECH/ExceptionHandler.cls.xml	(.../ExceptionHandler.cls.xml)	(revision 9)
+++ TECH/ExceptionHandler.cls.xml	(.../ExceptionHandler.cls.xml)	(revision 62)
@@ -10,8 +10,7 @@
 <FormalSpec>Exception:TECH.IException</FormalSpec>
 <Implementation><![CDATA[
 	Set %Exception = Exception
-	Set Omschrijving = %Exception.GeefOmschrijving()	
-	Set $ECODE = "`"_Exception.GeefExceptionCode()_"`"_Exception.GeefOmschrijving()_"`"
+	Throw ..ExceptieOudNaarNieuw(Exception)
 ]]></Implementation>
 </Method>
 
@@ -38,13 +37,13 @@
 			}
 			If (i < ExceptionTypes)
 			{
-				Set Exception = %Exception
 				Set %Exception = ""
 				Set $ECODE = ""
 			}
 			Else
 			{
-				ZTRAP $ZERROR
+				Set Exception = %Exception
+				Throw ..ExceptieOudNaarNieuw(Exception)
 			}
 		}
 		Else
@@ -54,10 +53,6 @@
 			Set $ECODE = ""
 		}
 	}
-	
-	Set Stack = ##class(TECH.Process).GeefStackTrace()
-	Do ##class(vhLib.Logger).%New("CATCH").Error("",Stack)
-	
 	Quit Exception
 ]]></Implementation>
 </Method>
@@ -85,9 +80,19 @@
 		Set %Exception = Exceptie
 	}
 	
-	ZTRAP $ZERROR
+	Set Exception = %Exception
+	Throw ..ExceptieOudNaarNieuw(Exception)
 ]]></Implementation>
 </Method>
+
+<Method name="ExceptieOudNaarNieuw">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Exceptie:TECH.Exceptions.Exception</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Exception.AbstractException</ReturnType>
+<Implementation><![CDATA[	Quit ##class(TECH.Exceptions.VerpakteException).%New($P(Exceptie.GeefExceptionCode(),":",2),$P(Exceptie.GeefExceptionCode(),":",1),"",Exceptie.GeefOmschrijving(),"",Exceptie)
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: TECH/Exceptions/Exception.cls.xml
===================================================================
diff -u -r9 -r62
--- TECH/Exceptions/Exception.cls.xml	(.../Exception.cls.xml)	(revision 9)
+++ TECH/Exceptions/Exception.cls.xml	(.../Exception.cls.xml)	(revision 62)
@@ -35,7 +35,7 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ..ErrorID = "" //$$LOG^%ETN()
-	Set ..Stack = ##class(TECH.Process).GeefStackTrace(1)
+	Set ..Stack = ..StackTrace(4)
 	Set ..Tijdstip = ##class(TECH.DateTime).CurrentTimeStamp()
 	Quit $$$OK
 ]]></Implementation>
@@ -82,6 +82,21 @@
 ]]></Implementation>
 </Method>
 
+<Method name="StackTrace">
+<FormalSpec>StackLevel</FormalSpec>
+<Private>1</Private>
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	Set Txt=""
+	For i=StackLevel:1:$ESTACK { 
+		Set Txt=Txt_$C(13,10)_i_"   "_$STACK($STACK-i)_" : "_$STACK($STACK-i,"PLACE")
+		#dim UitgevoerdeCode As %String = ##class(TECH.StringUtils).Trim(##class(TECH.StringUtils).Trim($STACK($STACK-i,"MCODE"),$c(9)))
+		Set:UitgevoerdeCode'="" Txt = Txt_$C(13,10)_"             -> "_UitgevoerdeCode
+	}
+	Quit Txt
+]]></Implementation>
+</Method>
+
 <Method name="GeefErrorInformatie">
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
Index: TECH/Exceptions/VerpakteException.cls.xml
===================================================================
diff -u
--- TECH/Exceptions/VerpakteException.cls.xml	(revision 0)
+++ TECH/Exceptions/VerpakteException.cls.xml	(revision 62)
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="TECH.Exceptions.VerpakteException">
+<Super>%Exception.AbstractException</Super>
+
+<Property name="Exceptie">
+<Type>TECH.Exceptions.Exception</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>pName:%String="",pCode:%String="",pLocation:%String="",pData:%String="",pInnerException:%Exception.AbstractException=$$$NULLOREF,Exceptie:TECH.Exceptions.Exception</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Status</ReturnType>
+<Implementation><![CDATA[
+	Set ..Exceptie = Exceptie
+	Quit ##super(pName,pCode,pLocation,pData,pInnerException)
+]]></Implementation>
+</Method>
+
+<Method name="DisplayString">
+<Description>
+This returns a string that represents the exception. Users should feel free
+to modify the format in subclasses</Description>
+<FormalSpec>pLevel:%Integer=0</FormalSpec>
+<Implementation><![CDATA[	Quit ..Exceptie.GeefOmschrijving()
+]]></Implementation>
+</Method>
+
+<Method name="DataGet">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[	Quit ..Exceptie.ToString()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>