Index: TECH/Context/RuntimeContext.cls.xml
===================================================================
diff -u -r3715 -r3760
--- TECH/Context/RuntimeContext.cls.xml	(.../RuntimeContext.cls.xml)	(revision 3715)
+++ TECH/Context/RuntimeContext.cls.xml	(.../RuntimeContext.cls.xml)	(revision 3760)
@@ -180,19 +180,20 @@
 			{
 				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
-				{
+				If (DeviceID?3(1.3N1".")1.3N) { // Controle op IP-formaat
 					Set IP = DeviceID
-				}
-				Else
-				{
+				} Else {
 					Set ..ComputerNaam = DeviceID
-					if $ListFind(##class(TECH.Config.ConfigMgr).Instance().GetString("TerminalServers",""),$zcvt($p(..ComputerNaam,"."),"U")) {
+					if $ListFind(##class(TECH.Config.ConfigMgr).Instance().GetString("TerminalServers",""),$zcvt($Piece(..ComputerNaam,".",1),"U")) {
 						#dim RemoteDesktopClient as %String = ..ShellExecuteDirectAndRead("GETRDPCLIENTNAME","","",CHUIActief)
 						If $$$HasLength(RemoteDesktopClient){
-							 Set ..ComputerNaam = RemoteDesktopClient
+							if ($ListFind(##class(TECH.Config.ConfigMgr).Instance().GetString("TerminalServers",""),$ZCVT($Piece(RemoteDesktopClient,".",1),"U"),RemoteDesktopClient)) {
+								Set ..ComputerNaam = RemoteDesktopClient
+							} else {
+								; geen omzetting.
+							}
 						} else {
-							Do ##class(vhLib.Logger).%New().ErrorMail("Reflection terminal emulatie", "VBA code en/of events out of date")
+							Do ##class(vhLib.Logger).%New().ErrorMail("Reflection terminal emulatie", "Reflection vanuit RDP sessio op "_ ..ComputerNaam _" : Gebruik een terminalserver compatible Reflection configuratie bestand")
 						}
 					}
 				}
@@ -257,7 +258,6 @@
 
 <Method name="ShellExecuteDirectAndRead">
 <FormalSpec>Actie:%String,Executable:%String,Parameter:%String,CHUIActief:%Boolean=$$$True</FormalSpec>
-<Private>1</Private>
 <ProcedureBlock>0</ProcedureBlock>
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[