Index: APPS/PM/ProductService.cls.xml
===================================================================
diff -u -r2147 -r3484
--- APPS/PM/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 2147)
+++ APPS/PM/ProductService.cls.xml	(.../ProductService.cls.xml)	(revision 3484)
@@ -292,8 +292,8 @@
 		Set PRNr = PRNrIterator.Next()
 		Set Herkend = 0 
 		If ((PRNr?1.N)){
-			Set TempProduct =  ProductAPI.GeefProduct(PRNr)
-			If ($IsObject(TempProduct)){
+			If (ProductAPI.BestaatProduct(PRNr)){
+				Set TempProduct =  ProductAPI.GeefProduct(PRNr)
 				Set Criteria=##class(APPS.PM.dto.ZoekCriteria).%New()
 				Set Criteria.SoortProductID=##class(APPS.PM.enu.SoortProductID).Identnummer()			
 				Set Criteria.ProductID = TempProduct.GeefIdentNr()
Index: DOM/PM/ProductAPI.cls.xml
===================================================================
diff -u -r2620 -r3484
--- DOM/PM/ProductAPI.cls.xml	(.../ProductAPI.cls.xml)	(revision 2620)
+++ DOM/PM/ProductAPI.cls.xml	(.../ProductAPI.cls.xml)	(revision 3484)
@@ -11,6 +11,12 @@
 <ReturnType>DOM.PM.Product</ReturnType>
 </Method>
 
+<Method name="BestaatProduct">
+<Abstract>1</Abstract>
+<FormalSpec>Nr:%Integer</FormalSpec>
+<ReturnType>%Boolean</ReturnType>
+</Method>
+
 <Method name="GeefProductIterator">
 <Abstract>1</Abstract>
 <ReturnType>TECH.Iterator</ReturnType>
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()