Index: DOM/PM/impl/DataM/DataMProduct.cls.xml
===================================================================
diff -u -r45737 -r45738
--- DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45737)
+++ DOM/PM/impl/DataM/DataMProduct.cls.xml	(.../DataMProduct.cls.xml)	(revision 45738)
@@ -65,20 +65,19 @@
 </Property>
 
 <Method name="%OnNew">
-<FormalSpec>ProductNummer:%Integer</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	Set ..IsNieuwProduct = 1
-	Set ..ProductNummer = ProductNummer
-	
 	Quit $$$OK
 ]]></Implementation>
 </Method>
 
 <Method name="Open">
+<FormalSpec>ProductNummer:%Integer</FormalSpec>
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	#dim Status As %Status = $$$OK
+	Set ..ProductNummer = ProductNummer
 	If ($data(^KPR(..ProductNummer))){
 		Set ..IsNieuwProduct = 0
 	} Else {
@@ -98,7 +97,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If ( i%Data = "")  {
-		Set i%Data = ^KPR(..ProductNummer,0)
+		Set i%Data = $$$If($length(..ProductNummer),^KPR(..ProductNummer,0),"")
 	}
 	Quit i%Data
 ]]></Implementation>
@@ -109,7 +108,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (i%Data1 = "") {
-		Set i%Data1 = ^KPR(..ProductNummer,1)
+		Set i%Data1 = $$$If($length(..ProductNummer),^KPR(..ProductNummer,1),"")
 	}
 	Quit i%Data1
 ]]></Implementation>
@@ -120,7 +119,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If ( i%Data2 = "") {
-			Set i%Data2 = ^KPR(..ProductNummer,2)
+			Set i%Data2 = $$$If($length(..ProductNummer),^KPR(..ProductNummer,2),"")
 	}
 	Quit i%Data2
 ]]></Implementation>
@@ -131,7 +130,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (i%Data3 = "") {
-		Set i%Data3 = ^KPR(..ProductNummer,3)
+		Set i%Data3 = $$$If($length(..ProductNummer),^KPR(..ProductNummer,3),"")
 	}
 	Quit i%Data3
 ]]></Implementation>
@@ -142,7 +141,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (i%Data15 = "") {
-		Set i%Data15 = $Get(^KPR(..ProductNummer,15))
+		Set i%Data15 = $$$If($length(..ProductNummer),$Get(^KPR(..ProductNummer,15)),"")
 	}
 	Quit i%Data15
 ]]></Implementation>
@@ -153,7 +152,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (i%DataJ = "") {
-		Set i%DataJ = ^KPR(..ProductNummer,$Order(^KPR(..ProductNummer,"J")))
+		Set i%DataJ = $$$If($length(..ProductNummer),^KPR(..ProductNummer,$Order(^KPR(..ProductNummer,"J"))),"")
 	}
 	Quit i%DataJ
 ]]></Implementation>
@@ -164,7 +163,7 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	If (i%DataG = "") {
-		Set i%DataG = ^KPR(..ProductNummer,"G")
+		Set i%DataG = $$$If($length(..ProductNummer),^KPR(..ProductNummer,"G"),"")
 	}
 	Quit i%DataG
 ]]></Implementation>