Index: AXimpl/Admin/VKP/OrderLookup.cls.xml
===================================================================
diff -u -r43385 -r43421
--- AXimpl/Admin/VKP/OrderLookup.cls.xml	(.../OrderLookup.cls.xml)	(revision 43385)
+++ AXimpl/Admin/VKP/OrderLookup.cls.xml	(.../OrderLookup.cls.xml)	(revision 43421)
@@ -30,7 +30,11 @@
 	#dim OrderId as %String = ""
 	if ResultSet.Next() {
 		Set OrderId = ResultSet.GetDataByName("ID")
-		Do:ResultSet.Next() ##class(TECH.ExceptionHandler).Throw(##class(AXimpl.Admin.DatabaseOutOfSyncException).%New(##class(AXimpl.Admin.EntiteitType).Order(),AxSalesId,OrderId _ "," _ ResultSet.Data("ID")))			
+		if ResultSet.Next() {
+			Set Exception  = ##class(AXimpl.Admin.DatabaseOutOfSyncException).%New(##class(AXimpl.Admin.EntiteitType).Order(),AxSalesId,OrderId _ "," _ ResultSet.GetDataByName("ID"))
+			Do Exception.VoegToeExtraInfo("Minstens 2 orders met dezelfde Ax SalesId gevonden")
+			Do ##class(TECH.ExceptionHandler).Throw(Exception)			
+		}		
 	} else {
 		Do ##class(TECH.ExceptionHandler).Throw(##class(AXimpl.Admin.DatabaseOutOfSyncException).%New(##class(AXimpl.Admin.EntiteitType).Order(),AxSalesId,""))		
 	}
Index: vhUnitTest/AXimpl/Admin/VKP/OrderLookup/Test.cls.xml
===================================================================
diff -u -r43385 -r43421
--- vhUnitTest/AXimpl/Admin/VKP/OrderLookup/Test.cls.xml	(.../Test.cls.xml)	(revision 43385)
+++ vhUnitTest/AXimpl/Admin/VKP/OrderLookup/Test.cls.xml	(.../Test.cls.xml)	(revision 43421)
@@ -30,6 +30,25 @@
 	#dim OrderId as %String = OrderLookup.GeefOrderId("AxSalesId")
 ]]></Implementation>
 </Method>
+
+<Method name="Test prepare query statement en meerdere orders gevonden">
+<Implementation><![CDATA[
+	#dim Columns as %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes("ID")
+	#dim Values as %ListOfDataTypes = ##class(TECH.ListUtils).CreateListOfDataTypes($ListBuild("1000"),$ListBuild("1001"))
+	Set QueryAPIFake = ##class(vhTest.Fake.TECH.Query.PrepareOnlyQueryAPI).%New(Values,Columns)
+	
+	Set OrderLookup = ##class(AXimpl.Admin.VKP.OrderLookup).%New(QueryAPIFake)
+	Try {		
+		#dim OrderId as %String = OrderLookup.GeefOrderId("AxSalesId")
+		Do ..Fail("Er werd een exceptie verwacht")
+	} Catch {
+		#dim Exception as TECH.Exceptions.Exception = ##class(TECH.ExceptionHandler).Catch()
+		Do $$$AssertEquals(Exception.%ClassName($$$True),##class(AXimpl.Admin.DatabaseOutOfSyncException).%ClassName($$$True))
+		Do $$$AssertEquals(Exception.GeefOmschrijving(),"!!! Ernstig probleem : Order is niet meer in sync - AxId : 'AxSalesId' - AdminId : '1000,1001' !!!!")
+		Do $$$AssertContains(Exception.GeefExtraInfo(),"Minstens 2 orders met dezelfde Ax SalesId gevonden")
+	}
+]]></Implementation>
+</Method>
 </Class>