Index: DOM/PM/impl/ProductImpl.cls.xml
===================================================================
diff -u -r45737 -r45738
--- DOM/PM/impl/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 45737)
+++ DOM/PM/impl/ProductImpl.cls.xml	(.../ProductImpl.cls.xml)	(revision 45738)
@@ -37,7 +37,7 @@
 <ReturnType>%Status</ReturnType>
 <ServerOnly>1</ServerOnly>
 <Implementation><![CDATA[
-	Do:$length(ProductId) ##class(TECH.Exceptions.IllegalUsageException).Throw("Momenteel niet toegelaten om producten te verkrijgen via deze manier -> Via OpenId gaan")
+	Set ..Product = $zobjClassMethod(..#DataMProductImpl,"%New",ProductId)
 	Quit $$$OK
 ]]></Implementation>
 </Method>
@@ -48,8 +48,7 @@
 <ReturnType>%Status</ReturnType>
 <Implementation><![CDATA[
 	#dim Status = $$$OK
-	Set ..Product = $zobjClassMethod(..#DataMProductImpl,"%New",ProductId)
-	Set Status = ..Product.Open()
+	Set Status = ..Product.Open(ProductId)
 	Quit Status
 ]]></Implementation>
 </Method>
@@ -81,7 +80,7 @@
 
 <Method name="GeefID">
 <ReturnType>%String</ReturnType>
-<Implementation><![CDATA[	Quit:('..Product.IsNieuwProduct()) ..Product.GeefID()
+<Implementation><![CDATA[	Quit ..Product.GeefID()
 ]]></Implementation>
 </Method>
 
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>
Index: vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml
===================================================================
diff -u -r45737 -r45738
--- vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml	(.../Test.cls.xml)	(revision 45737)
+++ vhUnitTest/DOM/PM/impl/ProductImpl/Test.cls.xml	(.../Test.cls.xml)	(revision 45738)
@@ -33,6 +33,20 @@
 	Do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProduct(..#ProductId)
 ]]></Implementation>
 </Method>
+
+<Method name="Test: Het product bestaat niet dus het mag gemaakt worden">
+<Implementation><![CDATA[
+	Do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProduct(..#ProductId)
+	
+	#dim Product As DOM.PM.Product = ##class(DOM.PM.impl.ProductImpl).%New(..#ProductId)
+	
+	Do $$$AssertTrue(Product.IsNieuwProduct())
+	Do $$$AssertEquals(Product.GeefID(),"")
+	Do $$$AssertEquals(Product.GeefKorttekst(),"")
+	
+	Do ##class(vhTest.Utils.DOM.PM.Product).VerwijderProduct(..#ProductId)
+]]></Implementation>
+</Method>
 </Class>