Index: TECH/Error/impl/ErrorHandler.cls.xml
===================================================================
diff -u -r1435 -r1504
--- TECH/Error/impl/ErrorHandler.cls.xml	(.../ErrorHandler.cls.xml)	(revision 1435)
+++ TECH/Error/impl/ErrorHandler.cls.xml	(.../ErrorHandler.cls.xml)	(revision 1504)
@@ -159,11 +159,26 @@
 	#dim LogLevel As vhLib.enu.LogNiveau = ##class(vhLib.enu.LogNiveau).Error()
 	If Exceptie.%Extends(##class(TECH.Exceptions.InvalidUserInputException).%ClassName(1)) {
 		Set LogLevel = ##class(vhLib.enu.LogNiveau).Warning()
+	}ElseIf (Exceptie.%Extends(##class(APPS.algemeen.VhintraShell.exc.AuthenticationException).%ClassName(1)) && ..IsGebruikerIngelogdViaTerminalService(Exceptie)){
+		Set LogLevel = ##class(vhLib.enu.LogNiveau).Warning()
 	}
 	Quit LogLevel
 ]]></Implementation>
 </Method>
 
+<Method name="IsGebruikerIngelogdViaTerminalService">
+<ClassMethod>1</ClassMethod>
+<FormalSpec>Exceptie:APPS.algemeen.VhintraShell.exc.AuthenticationException</FormalSpec>
+<Private>1</Private>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	#dim IsViaTerminalService As %Boolean = 0
+	#dim ExtraInfo As %String = ##class(TECH.StringUtils).ToUpper(Exceptie.GeefExtraInfo())
+	Set IsViaTerminalService = ##class(TECH.StringUtils).Contains(ExtraInfo,"GEBRUIKER: SCAN")
+	Quit IsViaTerminalService
+]]></Implementation>
+</Method>
+
 <Method name="GeefErroInfoAlsStream">
 <ClassMethod>1</ClassMethod>
 <FormalSpec>Error:TECH.Error.dto.ErrorInfo</FormalSpec>
Index: TECH/Exceptions/Exception.cls.xml
===================================================================
diff -u -r1492 -r1504
--- TECH/Exceptions/Exception.cls.xml	(.../Exception.cls.xml)	(revision 1492)
+++ TECH/Exceptions/Exception.cls.xml	(.../Exception.cls.xml)	(revision 1504)
@@ -215,6 +215,19 @@
 	}
 ]]></Implementation>
 </Method>
+
+<Method name="GeefExtraInfo">
+<ReturnType>%String</ReturnType>
+<Implementation><![CDATA[
+	#dim ExtraInfo As %String = ""
+	Do ..ExtraInfo.Rewind()
+	While '..ExtraInfo.AtEnd {
+		Set ExtraInfo = ExtraInfo_..ExtraInfo.ReadLine()_$C(13,10)
+	}
+	Do ..ExtraInfo.Rewind()
+	Quit ExtraInfo
+]]></Implementation>
+</Method>
 </Class>