Index: DOM/PM/HoutCertificaatService.cls.xml
===================================================================
diff -u -r33566 -r33568
--- DOM/PM/HoutCertificaatService.cls.xml	(.../HoutCertificaatService.cls.xml)	(revision 33566)
+++ DOM/PM/HoutCertificaatService.cls.xml	(.../HoutCertificaatService.cls.xml)	(revision 33568)
@@ -239,6 +239,10 @@
 	    Set HoutCertificaatID = ..ProductAPI.GeefProduct(PRNr).GeefHoutCertificaatID()
 	}
 	
+	if HoutCertificaatID = "" {
+		Quit $$$NULLOREF
+	}
+	
 	Quit ..GeefHoutCertificaat(HoutCertificaatID)
 ]]></Implementation>
 </Method>
Index: vhUnitTest/DOM/PM/HoutCertificaatService/BepaalCertificaatCode/Test.cls.xml
===================================================================
diff -u -r33566 -r33568
--- vhUnitTest/DOM/PM/HoutCertificaatService/BepaalCertificaatCode/Test.cls.xml	(.../Test.cls.xml)	(revision 33566)
+++ vhUnitTest/DOM/PM/HoutCertificaatService/BepaalCertificaatCode/Test.cls.xml	(.../Test.cls.xml)	(revision 33568)
@@ -38,6 +38,21 @@
 <Default>UT3004</Default>
 </Parameter>
 
+<Parameter name="FSCMix70ID">
+<Type>%String</Type>
+<Default>7030</Default>
+</Parameter>
+
+<Parameter name="PEFC80ID">
+<Type>%String</Type>
+<Default>8030</Default>
+</Parameter>
+
+<Parameter name="PEFC70ID">
+<Type>%String</Type>
+<Default>5050</Default>
+</Parameter>
+
 <Property name="PRBSData">
 <Type>vhTest.Dummy.DOM.PM.Maatwerk.PRBSData</Type>
 <Private>1</Private>
@@ -66,15 +81,11 @@
 
 <Method name="Test">
 <Implementation><![CDATA[
-	// Arrange 
-	#dim FSCMix70ID As TECH.String = "7030"
-	#dim PEFC80ID As TECH.String = "8030"
-	#dim PEFC70ID As TECH.String = "5050"
-	
+	// Arrange	
 	Do ..MaakTestProductData1Niveau()
 	
-	Do ..ZetHoutCertificaat(..#Kind01ProductID,FSCMix70ID)
-	Do ..ZetHoutCertificaat(..#Kind02ProductID,PEFC80ID)
+	Do ..ZetHoutCertificaat(..#Kind01ProductID,..#FSCMix70ID)
+	Do ..ZetHoutCertificaat(..#Kind02ProductID,..#PEFC80ID)
 	
 	Set HoutCertificaatService = ##class(DOM.PM.HoutCertificaatService).%New()
 
@@ -87,17 +98,15 @@
 	#dim HoutCertificaatCode As TECH.String= HoutCertificaatService.BepaalCertificaatCode(..#Moeder01ProductID)
 
 	// Assert
-	Do $$$AssertEquals(HoutCertificaatCode,PEFC70ID)
+	Do $$$AssertEquals(HoutCertificaatCode,..#PEFC70ID)
 ]]></Implementation>
 </Method>
 
 <Method name="Test enkel kind, om in de else terecht te komen">
 <Implementation><![CDATA[
-	// Arrange 
-	#dim FSCMix70ID As TECH.String = "7030"
-	
+	// Arrange	
 	Do ..MaakTestProductData1Niveau()
-	Do ..ZetHoutCertificaat(..#Kind01ProductID,FSCMix70ID)
+	Do ..ZetHoutCertificaat(..#Kind01ProductID,..#FSCMix70ID)
 	
 	Set HoutCertificaatService = ##class(DOM.PM.HoutCertificaatService).%New()
 
@@ -108,7 +117,7 @@
 	#dim HoutCertificaatCode As TECH.String= HoutCertificaatService.BepaalCertificaatCode(..#Kind01ProductID)
 
 	// Assert
-	Do $$$AssertEquals(HoutCertificaatCode,FSCMix70ID)
+	Do $$$AssertEquals(HoutCertificaatCode,..#FSCMix70ID)
 ]]></Implementation>
 </Method>
 
@@ -136,14 +145,12 @@
 
 <Method name="Test: Samengesteld product met meerdere niveaus (bv Space Tower) met overal een certificaat ingevuld">
 <Implementation><![CDATA[
-	#dim FSCMix70ID As TECH.String = "7030"
-	#dim PEFC80ID As TECH.String = "8030"
-	#dim PEFC70ID As TECH.String = "5050"
+	// Arrange
 	Do ..MaakTestProductData2Niveaus()
-	Do ..ZetHoutCertificaat(..#Kind01ProductID,FSCMix70ID)
-	Do ..ZetHoutCertificaat(..#Kind02ProductID,PEFC80ID)
-	Do ..ZetHoutCertificaat(..#Kind03ProductID,PEFC80ID)
-	Do ..ZetHoutCertificaat(..#Kind04ProductID,FSCMix70ID)
+	Do ..ZetHoutCertificaat(..#Kind01ProductID,..#FSCMix70ID)
+	Do ..ZetHoutCertificaat(..#Kind02ProductID,..#PEFC80ID)
+	Do ..ZetHoutCertificaat(..#Kind03ProductID,..#PEFC80ID)
+	Do ..ZetHoutCertificaat(..#Kind04ProductID,..#FSCMix70ID)
 	Set HoutCertificaatService = ##class(DOM.PM.HoutCertificaatService).%New()
 
 	#dim ProductAPI As DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
@@ -153,10 +160,31 @@
 	#dim HoutCertificaatCode As TECH.String= HoutCertificaatService.BepaalCertificaatCode(..#GrootMoeder01ProductID)
 
 	// Assert
-	Do $$$AssertEquals(HoutCertificaatCode,PEFC70ID)
+	Do $$$AssertEquals(HoutCertificaatCode,..#PEFC70ID)
 ]]></Implementation>
 </Method>
 
+<Method name="Test: Samengesteld product met meerdere niveaus (bv Space Tower) waarbij een moedernode enkel kinderen zonder certificaat heeft">
+<Implementation><![CDATA[
+	// Arrange
+	Do ..MaakTestProductData2Niveaus()
+	Do ..ZetHoutCertificaat(..#Kind01ProductID,..#FSCMix70ID)
+	Do ..ZetHoutCertificaat(..#Kind02ProductID,..#PEFC80ID)
+	Do ..ZetHoutCertificaat(..#Kind03ProductID,..#PEFC80ID)
+	Do ..ZetHoutCertificaat(..#Kind04ProductID,"")
+	Set HoutCertificaatService = ##class(DOM.PM.HoutCertificaatService).%New()
+
+	#dim ProductAPI As DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).MockInstance()
+	Do ProductAPI.IndienMethodCall("BestaatProduct",$$$ElkeWaarde).DanReturn($$$True)
+
+	// Act 
+	#dim HoutCertificaatCode As TECH.String= HoutCertificaatService.BepaalCertificaatCode(..#GrootMoeder01ProductID)
+
+	// Assert
+	Do $$$AssertEquals(HoutCertificaatCode,..#PEFC70ID)
+]]></Implementation>
+</Method>
+
 <Method name="MaakTestProductData1Niveau">
 <Implementation><![CDATA[
 	Do ..PRBSData.MaakTestProductData(..#Moeder01ProductID)
Index: DOM/PM/HoutCertificaat/impl/HoutCertificaatBepalerInput.cls.xml
===================================================================
diff -u -r33566 -r33568
--- DOM/PM/HoutCertificaat/impl/HoutCertificaatBepalerInput.cls.xml	(.../HoutCertificaatBepalerInput.cls.xml)	(revision 33566)
+++ DOM/PM/HoutCertificaat/impl/HoutCertificaatBepalerInput.cls.xml	(.../HoutCertificaatBepalerInput.cls.xml)	(revision 33568)
@@ -62,6 +62,9 @@
 	}
 
 	#dim HoutCertificaat As DOM.PM.impl.HoutCertificaat = ..HoutCertificaatService.GeefProductHoutCertificaat(ProductID)
+	if $$$Not($IsObject(HoutCertificaat)) {
+		Quit	
+	}
 	#dim HoutCertificaatType As DOM.PM.enu.HoutCertificaatType = HoutCertificaat.GeefHoutCertificaatType()
 
 	#dim dto As DOM.PM.HoutCertificaat.dto.HoutCertificaatProductItem = ..MaakHoutCertificaatProductItem(ProductID,Aantal)	
@@ -91,6 +94,9 @@
 	Set Item.Aantal=Aantal
 	
 	#dim HoutCertificaat As DOM.PM.impl.HoutCertificaat = ..HoutCertificaatService.GeefProductHoutCertificaat(ProductID)
+	if $$$Not($IsObject(HoutCertificaat)) {
+		Quit $$$NULLOREF
+	}
 	Set Item.HoutCertificaatID=HoutCertificaat.GeefID()
 	Set Item.HoutCertificaatRangschikking=HoutCertificaat.GeefRangschikking()
 	Quit Item