Index: AXimpl/MessageInProcessor.cls.xml
===================================================================
diff -u -r48832 -r49403
--- AXimpl/MessageInProcessor.cls.xml	(.../MessageInProcessor.cls.xml)	(revision 48832)
+++ AXimpl/MessageInProcessor.cls.xml	(.../MessageInProcessor.cls.xml)	(revision 49403)
@@ -48,12 +48,22 @@
 <Method name="Verwerk">
 <FormalSpec>FullFilename:%String</FormalSpec>
 <Implementation><![CDATA[
-	Do ..Logger.Info("Verwerking inkomende AX bestand", "Bestandsnaam " _FullFilename)
+	Lock +^AXimpl.MessageInProcessor:0 
+	Else  Quit	
 	
+	If $$$Not(..FileAPI.FileExists(FullFilename)) {
+		Lock -^AXimpl.MessageInProcessor
+		Quit	
+	}
+	
 	#dim SessionId As %String = ##class(TECH.Context.RuntimeContext).Instance().GeefSessieID()
-	set $piece(SessionId," ",2) = ##class(TECH.File).GeefBestandsnaam(FullFilename)
-	do ##class(TECH.Context.RuntimeContext).Instance().ZetSessieID(SessionId)
+	Set $piece(SessionId," ",2) = ##class(TECH.File).GeefBestandsnaam(FullFilename)
+
+	Do ##class(TECH.Context.RuntimeContext).Instance().ZetSessieID(SessionId)
+	Do ##class(TECH.Context.RuntimeContext).Instance().ZetApplicatie("AxIncomingFileBasedRequests")
 	
+	Do ..Logger.Info("Verwerking inkomende AX bestand", "Bestandsnaam " _FullFilename)
+	
 	Try {
 
 		#dim DebugStream As %Stream.Object = ##class(%GlobalCharacterStream).%New()
@@ -72,13 +82,18 @@
 		Do ..EventRaiser.RaiseRequestReceivedEvent(SubPath,FullFilename,..FileAPI.GeefFileReader(FullFilename).GeefStream())
 		
 		Do ..FileAPI.DeleteFile(FullFilename)
-		
 	} Catch {
-		#dim Exception As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
-		Do ..LogException(FullFilename, Exception)
-		Do ..EventRaiser.RaiseCorruptedRequestReceivedEvent(FullFilename,..FileAPI.GeefFileReader(FullFilename).GeefStream())
-		Do ..MoveFileToErrorMap(FullFilename)
+		try {
+			#dim Exception As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
+			Do ..LogException(FullFilename, Exception)
+			Do ..EventRaiser.RaiseCorruptedRequestReceivedEvent(FullFilename,..FileAPI.GeefFileReader(FullFilename).GeefStream())
+			Do ..MoveFileToErrorMap(FullFilename , SubPath)
+		} catch {
+			#dim InnerException As TECH.IException = ##class(TECH.ExceptionHandler).Catch()
+		}
 	}
+	
+	Lock -^AXimpl.MessageInProcessor
 ]]></Implementation>
 </Method>
 
@@ -99,11 +114,12 @@
 </Method>
 
 <Method name="MoveFileToErrorMap">
-<FormalSpec>FullFilename:%String</FormalSpec>
+<FormalSpec>FullFilename:%String,SubPath:%String</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim ErrorPath As %String = ##class(TECH.Config.ConfigMgr).Instance().GetString("AX_IF_IN_ErrorPath")
+	#dim ErrorPath As %String = ##class(TECH.Files).AppendSubPath(##class(TECH.Config.ConfigMgr).Instance().GetString("AX_IF_IN_ErrorPath"),##class(TECH.File).GetDirectory(FullFilename))
 	#dim ErrorFilename As %String = ##class(TECH.Files).AppendFile(ErrorPath,##class(TECH.File).GetFilename(FullFilename))
+	Do ..FileAPI.GeefDirectoryUtils().CreateIfNotExists(ErrorPath)
 	Do ..FileAPI.MoveFile(FullFilename,ErrorFilename)
 ]]></Implementation>
 </Method>
@@ -112,8 +128,10 @@
 <FormalSpec>FullFilename:%String,Exception:TECH.IException</FormalSpec>
 <Private>1</Private>
 <Implementation><![CDATA[
-	#dim ExceptionMessage As %String = "Filename : " _FullFilename _$$$CRLF
-	Set ExceptionMessage = ExceptionMessage _Exception.GeefOmschrijving()
+	#dim ExceptionMessage As %Stream.Object = ##class(%GlobalCharacterStream).%New()
+	do ExceptionMessage.WriteLine("Filename : " _FullFilename)
+	do ExceptionMessage.WriteLine("")
+	do ExceptionMessage.CopyFrom(Exception.ToStream())
 	Do ..Logger.Error("Verwerking inkomende AX bestand", ExceptionMessage)
 ]]></Implementation>
 </Method>