Index: DOM/OV/impl/DataM/DataMOrder.cls.xml
===================================================================
diff -u -r2903 -r3526
--- DOM/OV/impl/DataM/DataMOrder.cls.xml	(.../DataMOrder.cls.xml)	(revision 2903)
+++ DOM/OV/impl/DataM/DataMOrder.cls.xml	(.../DataMOrder.cls.xml)	(revision 3526)
@@ -46,23 +46,20 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set Status = $$$OK
-	If ($Data(^KO1(OrderNr,"F")))
+	
+	Set OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()
+	If (OrderAPI.BestaatOrder(OrderNr))
 	{
 		Set ..OrderNr = OrderNr
 		Set ..KlantNr = $Piece($Get(^KO1(OrderNr,"F")),"\")
-		If ($Data(^KOD(..KlantNr,"F",..OrderNr)))
-		{
-			Set ..VolgendOrderLijnNr = ^KOD(..KlantNr,"F",..OrderNr,0)
-		}
-		Else
-		{
-			Set Status = $$$ERROR($$$GeneralError,"Dit order is niet meer aanwezig")
-		}
+		Set ..VolgendOrderLijnNr = ^KOD(..KlantNr,"F",..OrderNr,0)
+		Set ..VolgendOrderLijnNr = ^KOD(..KlantNr,"F",..OrderNr,0)
 	}
 	Else
 	{
 		Set Status = $$$ERROR($$$GeneralError,"Dit order is niet meer aanwezig")
 	}
+	
 	Quit Status
 ]]></Implementation>
 </Method>