Index: DOM/PM/impl/DataM/DataMProductAPI.cls.xml
===================================================================
diff -u -r2851 -r3484
--- DOM/PM/impl/DataM/DataMProductAPI.cls.xml	(.../DataMProductAPI.cls.xml)	(revision 2851)
+++ DOM/PM/impl/DataM/DataMProductAPI.cls.xml	(.../DataMProductAPI.cls.xml)	(revision 3484)
@@ -10,6 +10,11 @@
 <FormalSpec>ProductNummer:%Integer</FormalSpec>
 <ReturnType>DOM.PM.Product</ReturnType>
 <Implementation><![CDATA[
+	If ('..BestaatProduct(ProductNummer))
+	{
+		Do ##class(TECH.ExceptionHandler).Throw(##class(TECH.Exceptions.InvalidInputException).%New("Product "_ProductNummer_" bestaat niet!"))
+	}
+	
 	Set Product = ""
 	Set GenType = $P($$GENTYP^HAD(ProductNummer),"\",1,2) 
 	If (GenType = "TBX\PRO") || (GenType = "TBX\PR+") || (GenType = "TBX\STD") || (GenType = "TBX\PRB") || ((GenType = "TBX\BBX") && ($LG(##class(Prod.Kenmerk.DataDefinitie).Get("TBX",ProductNummer,"KLAS")) = "B"))
@@ -115,6 +120,13 @@
 ]]></Implementation>
 </Method>
 
+<Method name="BestaatProduct">
+<FormalSpec>ProductNummer:%Integer</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+<Implementation><![CDATA[	Quit $Data(^KPR(ProductNummer))
+]]></Implementation>
+</Method>
+
 <Method name="GeefProductIterator">
 <ReturnType>TECH.Iterator</ReturnType>
 <Implementation><![CDATA[	Quit ##class(DOM.PM.impl.DataM.DataMProductIterator).%New()