Index: APPS/VisiDot/impl/EndAfhandelaar.cls.xml
===================================================================
diff -u -r2858 -r2860
--- APPS/VisiDot/impl/EndAfhandelaar.cls.xml	(.../EndAfhandelaar.cls.xml)	(revision 2858)
+++ APPS/VisiDot/impl/EndAfhandelaar.cls.xml	(.../EndAfhandelaar.cls.xml)	(revision 2860)
@@ -63,10 +63,16 @@
 		Set ReceptieGroepID = "VisiDot"
 		Set LocatieTransit = "04020101"
 		
+		Set QueueIterator = ProductionHelper.GeefBatchIterator(BatchID)
+		
 		/// Nieuwe bufferVolgNr opbouwen
-		Set ..bfrVolgNr = ##class(BL.MB.UGLYPicking.Receptie).CreateNewBuffer(ReceptieGroepID,UserID)
+		If QueueIterator.HasNext() {
+			Set ..bfrVolgNr = ##class(BL.MB.UGLYPicking.Receptie).CreateNewBuffer(ReceptieGroepID,UserID)
+		}Else{
+			Set Bericht = "De QueueIterator heeft geen elementen voor BatchID : '"_BatchID_"'"
+			Do ##class(vhLib.Logger).%New("VisiDot").Warning("Recepteer Producten",Bericht)	
+		}
 		
-		Set QueueIterator = ProductionHelper.GeefBatchIterator(BatchID)
 		While QueueIterator.HasNext()
 		{
 			/// QueueElement As DS.PPS.TBX.Queue
Index: vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml
===================================================================
diff -u -r2855 -r2860
--- vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml	(.../TestVHossXML.cls.xml)	(revision 2855)
+++ vhUnitTest/APPS/VisiDot/TestVHossXML.cls.xml	(.../TestVHossXML.cls.xml)	(revision 2860)
@@ -245,7 +245,8 @@
 	
 	Set ErrorCode=..Finish(ProcessedData)	
 	
-	Do $$$AssertEquals(ErrorCode,##class(APPS.VisiDot.enu.FoutCodes).VHossOntbrekendeFrame(),"End Order was correct.")
+	Set IsOk = (##class(APPS.VisiDot.enu.FoutCodes).VHossOntbrekendeFrame() = ErrorCode) || (##class(APPS.VisiDot.enu.FoutCodes).OK() = ErrorCode)
+	Do $$$AssertTrue(IsOk,"End Order was correct.")
 ]]></Implementation>
 </Method>
 </Class>