Index: vhUnitTest/WS/AX/Inventory/InventoryReceiveService/Test.cls.xml
===================================================================
diff -u -r45752 -r53899
--- vhUnitTest/WS/AX/Inventory/InventoryReceiveService/Test.cls.xml	(.../Test.cls.xml)	(revision 45752)
+++ vhUnitTest/WS/AX/Inventory/InventoryReceiveService/Test.cls.xml	(.../Test.cls.xml)	(revision 53899)
@@ -9,6 +9,8 @@
 	Do MessageManagerMock.VerwachtMethodCall("GenerateID").DanReturn("MessageId")
 
 	#dim DummyStreamIn As %GlobalCharacterStream = ##class(%GlobalCharacterStream).%New()
+	Do DummyStreamIn.WriteLine("<?xml version=""1.0"" encoding=""utf-16""?>")
+	Do DummyStreamIn.WriteLine("een speciaal character " _ $CHAR(161))
 	Set Request = ##class(AXif.Dynamics.InventoryIn.MessageParts.AxdADUMsgWMSJournalOut).%New()
 	Set XmlCorrelaterMock = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()
 	Do XmlCorrelaterMock.VerwachtMethodCall("FromStream", DummyStreamIn, "AXif.Dynamics.InventoryIn.MessageParts.AxdADUMsgWMSJournalOut", "ADUMsgWMSJournalOut").DanReturn(Request)
@@ -19,14 +21,42 @@
 	
 	Set Service = ##class(WS.AX.Inventory.InventoryReceiveService).%New(ConverterMock,XmlCorrelaterMock,MessageManagerMock)		
 	#dim StreamOut As %GlobalCharacterStream = Service.ReceiveInventory(DummyStreamIn)
+
+	Do $$$AssertFalse( ##class(TECH.StreamUtils).IsTextInStream(DummyStreamIn,"<?xml version=""1.0"" encoding=""utf-16""?>"))
+	Do $$$AssertTrue( ##class(TECH.StreamUtils).IsTextInStream(DummyStreamIn,"<?xml version=""1.0"" encoding=""ISO-8859-1""?>"))
+	Do $$$AssertTrue( ##class(TECH.StreamUtils).IsTextInStream(DummyStreamIn,$CHAR(161)))
 	
+	
 	Do XmlCorrelaterMock.Verifieer()
 	Do ConverterMock.Verifieer()
 	Do MessageManagerMock.Verifieer()
 		
 	Do $$$AssertTrue(StreamOut.%IsA("%GlobalCharacterStream"))
 ]]></Implementation>
 </Method>
+
+<Method name="Test een invalidinputexception wordt gesmeten indien char 160 in de input stream zit">
+<Implementation><![CDATA[
+	Set MessageManagerMock = ##class(vhTest.Mock.AXimpl.MessageManager).%New()
+	Do MessageManagerMock.VerwachtMethodCall("GenerateID").DanReturn("MessageId")
+
+	#dim DummyStreamIn As %GlobalCharacterStream = ##class(%GlobalCharacterStream).%New()
+	Do DummyStreamIn.WriteLine("een lijn met een" _ $CHAR(160) _ "harde spatie")
+
+	Set XmlCorrelaterMock = ##class(vhTest.Mock.TECH.XMLCorrelater).%New()		
+	Set ConverterMock = ##class(vhTest.Mock.AXimpl.Dynamics.InventoryIn.Converter.InventoryInConverter).%New()
+	
+	Set Service = ##class(WS.AX.Inventory.InventoryReceiveService).%New(ConverterMock,XmlCorrelaterMock,MessageManagerMock)			
+	try {
+		#dim StreamOut As %GlobalCharacterStream = Service.ReceiveInventory(DummyStreamIn)
+	} catch {
+		#dim Exception As TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+	}
+	Do $$$AssertEquals(Exception.GeefOmschrijving(),"In het ontvangstjournaal zit minstens char(160) characters (harde spaties). Contacteer ICT. Moet aan de bron (AX) aangepakt worden")
+
+	Do MessageManagerMock.Verifieer()
+]]></Implementation>
+</Method>
 </Class>
 
 
Index: WS/AX/Inventory/InventoryReceiveService.cls.xml
===================================================================
diff -u -r49103 -r53899
--- WS/AX/Inventory/InventoryReceiveService.cls.xml	(.../InventoryReceiveService.cls.xml)	(revision 49103)
+++ WS/AX/Inventory/InventoryReceiveService.cls.xml	(.../InventoryReceiveService.cls.xml)	(revision 53899)
@@ -48,6 +48,13 @@
 <WebMethod>1</WebMethod>
 <Implementation><![CDATA[
 	#dim GUID As %String = ..MessageManager.GenerateID()
+	; De request is al van UTF-8 omgezet naar ISO-8859-1, maar in de payload xml in de cdata tag staat nog altijd de tag dat het UTF-16 is. 
+	; Om fouten bij een 2e omzetting door de correlator te voorkomen, veranderen we dus de encoding property van de xml declaratie
+	Do ##class(TECH.StreamUtils).Replace(In,"<?xml version=""1.0"" encoding=""utf-16""?>","<?xml version=""1.0"" encoding=""ISO-8859-1""?>")
+	if ##class(TECH.StreamUtils).IsTextInStream(In,$CHAR(160)){
+		;smijt een exceptie omat er wsl een nbsp in een korttekst zit, iig hoort de nbsp hier niet thuis.
+		Do ##class(TECH.Exceptions.InvalidInputException).Throw("In het ontvangstjournaal zit minstens char(160) characters (harde spaties). Contacteer ICT. Moet aan de bron (AX) aangepakt worden")		
+	}
 
 	#dim WMSJournalOutRequest As AXif.Dynamics.InventoryIn.MessageParts.AxdADUMsgWMSJournalOut = ..XmlCorrelater.FromStream(In, ##class(AXif.Dynamics.InventoryIn.MessageParts.AxdADUMsgWMSJournalOut).%ClassName(1), "ADUMsgWMSJournalOut")
 	#dim WMSJournalOutResponse as AXif.Dynamics.Inventory.MessageParts = ..Converter.Convert(WMSJournalOutRequest,GUID)