Index: DOM/LEV/impl/DataM/DataMToelevering.cls.xml
===================================================================
diff -u -r2911 -r3616
--- DOM/LEV/impl/DataM/DataMToelevering.cls.xml	(.../DataMToelevering.cls.xml)	(revision 2911)
+++ DOM/LEV/impl/DataM/DataMToelevering.cls.xml	(.../DataMToelevering.cls.xml)	(revision 3616)
@@ -20,6 +20,11 @@
 <Private>1</Private>
 </Property>
 
+<Property name="Order">
+<Type>DOM.OV.Order</Type>
+<Private>1</Private>
+</Property>
+
 <Method name="%OnNew">
 <FormalSpec>ToeleveringNummer:%Integer</FormalSpec>
 <Private>1</Private>
@@ -88,10 +93,13 @@
 <Method name="GeefOrder">
 <ReturnType>DOM.OV.Order</ReturnType>
 <Implementation><![CDATA[
-	Set OrderNr = $Piece(..Data,"\",7)
-	Set Order = ""
-	If (OrderNr '= "") Set Order = ##class(DOM.DomeinContext).Instance().GeefOrderAPI().GeefOrder(OrderNr)
-	Quit Order
+	If ('$IsObject(..Order))
+	{
+		Set OrderNr = $Piece(..Data,"\",7)
+		Set OrderAPI = ##class(DOM.DomeinContext).Instance().GeefOrderAPI()
+		If ((OrderNr '= "") && OrderAPI.BestaatOrder(OrderNr)) Set ..Order = OrderAPI.GeefOrder(OrderNr)
+	}
+	Quit ..Order
 ]]></Implementation>
 </Method>