Index: DOM/OV/impl/DataM/DataMOrderAPI.cls.xml
===================================================================
diff -u -r2230 -r3526
--- DOM/OV/impl/DataM/DataMOrderAPI.cls.xml	(.../DataMOrderAPI.cls.xml)	(revision 2230)
+++ DOM/OV/impl/DataM/DataMOrderAPI.cls.xml	(.../DataMOrderAPI.cls.xml)	(revision 3526)
@@ -8,10 +8,33 @@
 <Method name="GeefOrder">
 <FormalSpec>OrderNr:%Integer</FormalSpec>
 <ReturnType>DOM.OV.Order</ReturnType>
-<Implementation><![CDATA[	Quit ##class(DOM.OV.impl.DataM.DataMOrder).%New(OrderNr)
+<Implementation><![CDATA[
+	If ('..BestaatOrder(OrderNr))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Order "_OrderNr_" bestaat niet!"))
+	}
+	
+	Quit ##class(DOM.OV.impl.DataM.DataMOrder).%New(OrderNr)
 ]]></Implementation>
 </Method>
 
+<Method name="BestaatOrder">
+<FormalSpec>OrderNr:%Integer</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[
+	Set Bestaat = 0
+	If ($Data(^KO1(OrderNr,"F")))
+	{
+		Set KlantNr = $Piece($Get(^KO1(OrderNr,"F")),"\")
+		If ($Data(^KOD(KlantNr,"F",OrderNr)))
+		{
+			Set Bestaat = 1
+		}
+	}
+	Quit Bestaat
+]]></Implementation>
+</Method>
+
 <Method name="GeefNieuwOrder">
 <FormalSpec>OrderNr:%Integer</FormalSpec>
 <ReturnType>DOM.OV.Order</ReturnType>