Index: vhTest/Fake/AXimpl/MessageInProcessor/ExceptionLogger.cls.xml
===================================================================
diff -u
--- vhTest/Fake/AXimpl/MessageInProcessor/ExceptionLogger.cls.xml	(revision 0)
+++ vhTest/Fake/AXimpl/MessageInProcessor/ExceptionLogger.cls.xml	(revision 50140)
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Fake.AXimpl.MessageInProcessor.ExceptionLogger">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden, nieuwe methodes worden automatisch bijgevoegd, bestaande blijven zoals ze zijn.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AXimpl.MessageInProcessor.ExceptionLogger</Super>
+
+<Method name="LogException">
+<FormalSpec>FullFilename:%String,Exception:TECH.IException</FormalSpec>
+<Implementation><![CDATA[
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/AXimpl/MessageInProcessor/ExceptionLogger/Test.cls.xml
===================================================================
diff -u
--- vhUnitTest/AXimpl/MessageInProcessor/ExceptionLogger/Test.cls.xml	(revision 0)
+++ vhUnitTest/AXimpl/MessageInProcessor/ExceptionLogger/Test.cls.xml	(revision 50140)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhUnitTest.AXimpl.MessageInProcessor.ExceptionLogger.Test">
+<Super>vhUnitTest.TestCase</Super>
+
+<Method name="Test: Error wordt gelogd als warning indien InvalidInputException">
+<Implementation><![CDATA[	Do ..AssertLogger(##class(TECH.Exceptions.InvalidInputException).%New("RandomOmschrijving"), "Warning")
+]]></Implementation>
+</Method>
+
+<Method name="Test: Error wordt gemaild indien geen InvalidInputException">
+<Implementation><![CDATA[	Do ..AssertLogger(##class(TECH.Exceptions.GeneralErrorException).%New("RandomOmschrijving"), "ErrorMail")
+]]></Implementation>
+</Method>
+
+<Method name="AssertLogger">
+<FormalSpec>Exception:TECH.Exceptions.Exception,VerwachteMethodCall:%String</FormalSpec>
+<Private>1</Private>
+<Implementation><![CDATA[
+	#dim LoggerMock As vhTest.Mock.vhLib.Logger = ##class(vhTest.Mock.vhLib.Logger).%New()
+	Do LoggerMock.VerwachtMethodCall(VerwachteMethodCall, "Verwerking inkomende AX bestand", $$$ElkeWaarde)
+	
+	#dim ExceptionLogger As AXimpl.MessageInProcessor.ExceptionLogger = ##class(AXimpl.MessageInProcessor.ExceptionLogger).%New(LoggerMock)
+	Do ExceptionLogger.LogException("RandomFullFileName", Exception)
+	
+	Do LoggerMock.Verifieer()
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXimpl/MessageInProcessor.cls.xml
===================================================================
diff -u -r50138 -r50140
--- AXimpl/MessageInProcessor.cls.xml	(.../MessageInProcessor.cls.xml)	(revision 50138)
+++ AXimpl/MessageInProcessor.cls.xml	(.../MessageInProcessor.cls.xml)	(revision 50140)
@@ -38,8 +38,13 @@
 <Private>1</Private>
 </Property>
 
+<Property name="ExceptionLogger">
+<Type>AXimpl.MessageInProcessor.ExceptionLogger</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
-<FormalSpec>FileApi:TECH.File.FileAPI="",XmlCorrelater:TECH.XMLCorrelater="",EventRaiser:AXimpl.EventRaiser="",ConfigIn:AXimpl.ConfigIn="",VerwerkBestandOpnieuwAanvraagRepository:AXimpl.VerwerkBestandOpnieuwAanvraagRepository="",MailApi:TECH.Mail.MailAPI=""</FormalSpec>
+<FormalSpec>FileApi:TECH.File.FileAPI="",XmlCorrelater:TECH.XMLCorrelater="",EventRaiser:AXimpl.EventRaiser="",ConfigIn:AXimpl.ConfigIn="",VerwerkBestandOpnieuwAanvraagRepository:AXimpl.VerwerkBestandOpnieuwAanvraagRepository="",MailApi:TECH.Mail.MailAPI="",ExceptionLogger:AXimpl.MessageInProcessor.ExceptionLogger=""</FormalSpec>
 <Private>1</Private>
 <ProcedureBlock>1</ProcedureBlock>
 <ReturnType>%Status</ReturnType>
@@ -52,6 +57,7 @@
 	Set ..VerwerkBestandOpnieuwAanvraagRepository = $$$Inject(VerwerkBestandOpnieuwAanvraagRepository, ##class(VerwerkBestandOpnieuwAanvraagRepository).%New())
 	Set ..Logger = ##class(vhLib.Logger).%New()
 	Set ..MailApi = $$$Inject(MailApi, ##class(TECH.Context).Instance().GeefMailAPI())
+	Set ..ExceptionLogger = $$$Inject(ExceptionLogger, ##class(AXimpl.MessageInProcessor.ExceptionLogger).%New())
 	
 	Quit $$$OK
 ]]></Implementation>
@@ -105,7 +111,7 @@
 					Do ..RegistreerVerwerkBestandOpnieuwAanvraag(FullFilename)
 	 			} Else {
 					Set VerwerkVolgende = $$$False
-					Do ..LogException(FullFilename, Exception)
+					Do ..ExceptionLogger.LogException(FullFilename, Exception)
 					Do ..EventRaiser.RaiseCorruptedRequestReceivedEvent(FullFilename, ..FileApi.GeefFileReader(FullFilename).GeefStream())
 					Do ..MoveFileToErrorMap(FullFilename , SubPath)
 					Do ..MarkeerVerwerkBestandOpnieuwAanvraagVerwerkt(FullFilename)
@@ -148,18 +154,6 @@
 ]]></Implementation>
 </Method>
 
-<Method name="LogException">
-<FormalSpec>FullFilename:%String,Exception:TECH.IException</FormalSpec>
-<Private>1</Private>
-<Implementation><![CDATA[
-	#dim ExceptionMessage As %Stream.Object = ##class(%GlobalCharacterStream).%New()
-	Do ExceptionMessage.WriteLine("Filename : " _FullFilename)
-	Do ExceptionMessage.WriteLine("")
-	Do ExceptionMessage.CopyFrom(Exception.ToStream())
-	Do ..Logger.ErrorMail("Verwerking inkomende AX bestand", ExceptionMessage)
-]]></Implementation>
-</Method>
-
 <Method name="RegistreerVerwerkBestandOpnieuwAanvraag">
 <FormalSpec>Filenaam:%String</FormalSpec>
 <Private>1</Private>
Index: vhTest/Mock/AXimpl/MessageInProcessor/ExceptionLogger.cls.xml
===================================================================
diff -u
--- vhTest/Mock/AXimpl/MessageInProcessor/ExceptionLogger.cls.xml	(revision 0)
+++ vhTest/Mock/AXimpl/MessageInProcessor/ExceptionLogger.cls.xml	(revision 50140)
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="vhTest.Mock.AXimpl.MessageInProcessor.ExceptionLogger">
+<Description>
+Deze klasse werd automatisch gegenereerd en onderhouden - lokale aanpassingen zijn niet nodig.
+Een hercompilatie van de basis interface - met een correct werkende studiohook ( v2.20 ++ ) - zorgt ervoor dat deze klasse aangepast wordt</Description>
+<ProcedureBlock>1</ProcedureBlock>
+<Super>AXimpl.MessageInProcessor.ExceptionLogger,Tools.Mock.MockClassBase</Super>
+<Inheritance>right</Inheritance>
+
+<Method name="LogException">
+<FormalSpec>FullFilename:%String,Exception:TECH.IException</FormalSpec>
+<Implementation><![CDATA[	do ..VerwerkMethodCall("LogException",FullFilename,Exception)
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: AXimpl/MessageInProcessor/ExceptionLogger.cls.xml
===================================================================
diff -u
--- AXimpl/MessageInProcessor/ExceptionLogger.cls.xml	(revision 0)
+++ AXimpl/MessageInProcessor/ExceptionLogger.cls.xml	(revision 50140)
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Export generator="Cache" version="24">
+<Class name="AXimpl.MessageInProcessor.ExceptionLogger">
+<Super>TECH.Mockable</Super>
+
+<Property name="Logger">
+<Type>vhLib.Logger</Type>
+<Private>1</Private>
+</Property>
+
+<Method name="%OnNew">
+<FormalSpec>Logger:vhLib.Logger=""</FormalSpec>
+<Private>1</Private>
+<ProcedureBlock>1</ProcedureBlock>
+<ReturnType>%Status</ReturnType>
+<ServerOnly>1</ServerOnly>
+<Implementation><![CDATA[
+	Set ..Logger = $$$Inject(Logger, ##class(vhLib.Logger).%New())
+	
+	Quit $$$OK
+]]></Implementation>
+</Method>
+
+<Method name="LogException">
+<FormalSpec>FullFilename:%String,Exception:TECH.IException</FormalSpec>
+<Implementation><![CDATA[
+	#dim Actie As %String = "Verwerking inkomende AX bestand"
+	#dim ExceptionMessage As %Stream.Object = ##class(%GlobalCharacterStream).%New()
+	
+	Do ExceptionMessage.WriteLine("Filename : " _FullFilename)
+	Do ExceptionMessage.WriteLine("")
+	Do ExceptionMessage.CopyFrom(Exception.ToStream())
+	
+	If (Exception.%IsA(##class("TECH.Exceptions.InvalidInputException").%ClassName($$$True))) {
+		Do ..Logger.Warning(Actie, ExceptionMessage)
+	} Else {
+		Do ..Logger.ErrorMail(Actie, ExceptionMessage)	
+	}
+]]></Implementation>
+</Method>
+</Class>
+
+
+</Export>
Index: vhUnitTest/AXimpl/MessageInProcessor/Verwerk/Test.cls.xml
===================================================================
diff -u -r49693 -r50140
--- vhUnitTest/AXimpl/MessageInProcessor/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 49693)
+++ vhUnitTest/AXimpl/MessageInProcessor/Verwerk/Test.cls.xml	(.../Test.cls.xml)	(revision 50140)
@@ -392,6 +392,30 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: ExceptionLogger wordt opgeroepen indien een fout, verschillend van VerwerkAXBerichtLaterOpnieuwException, optreedt bij het verwerken">
+<Implementation><![CDATA[
+	#dim RandomFullFileName As %String = "RandomFullFileName"
+	#dim DummyException As TECH.IException = $$$DummyException
+	
+	#dim FileIteratorStub As vhTest.Mock.TECH.Iterator = ##class(vhTest.Mock.TECH.Iterator).%New()
+	Do FileIteratorStub.IndienMethodCall("Reset").DanDoeNiks()
+	Do FileIteratorStub.IndienMethodCall("HasNext").DanReturn($$$True)
+	Do FileIteratorStub.IndienMethodCall("Next").DanReturn(RandomFullFileName)
+	
+	#dim FileApiStub As vhTest.Mock.TECH.File.FileAPI = ##class(vhTest.Mock.TECH.File.FileAPI).%New()
+	Do FileApiStub.IndienMethodCall("GetFileList", $$$ElkeWaarde, $$$ElkeWaarde).DanReturn(FileIteratorStub)
+	Do FileApiStub.IndienMethodCall("GeefFileReader", RandomFullFileName).DanException(DummyException)
+	
+	#dim ExceptionLoggerMock As vhTest.Mock.AXimpl.MessageInProcessor.ExceptionLogger = ##class(vhTest.Mock.AXimpl.MessageInProcessor.ExceptionLogger).%New()
+	Do ExceptionLoggerMock.VerwachtMethodCall("LogException", RandomFullFileName, DummyException).DanDoeNiks()
+	
+	#dim MessageInProcessor As AXimpl.MessageInProcessor = ##class(AXimpl.MessageInProcessor).%New(FileApiStub, "", "", "", "", "", ExceptionLoggerMock)
+	Do MessageInProcessor.Verwerk()
+	
+	Do ExceptionLoggerMock.Verifieer()
+]]></Implementation>
+</Method>
+
 <Method name="GeefFileList">
 <Private>1</Private>
 <Implementation><![CDATA[