Index: APPS/VKP/impl/OfferteDocumentReferentiesBepaler.cls.xml
===================================================================
diff -u -r32748 -r32750
--- APPS/VKP/impl/OfferteDocumentReferentiesBepaler.cls.xml	(.../OfferteDocumentReferentiesBepaler.cls.xml)	(revision 32748)
+++ APPS/VKP/impl/OfferteDocumentReferentiesBepaler.cls.xml	(.../OfferteDocumentReferentiesBepaler.cls.xml)	(revision 32750)
@@ -55,9 +55,11 @@
 	Set ReturnDocRefs = ##class(APPS.VKP.impl.OfferteDocumentReferentiesBepaler.DocumentReferenties).%New()
 	
 	#dim OfferteDocRef As DOM.VKP.DocumentReferenties = Offerte.GeefDocumentReferenties()
+	If $IsObject(OfferteDocRef) {
 		Set ReturnDocRefs.OrderReferentie = OfferteDocRef.OrderReferentie
 		Set ReturnDocRefs.KlantOrderNummer = OfferteDocRef.KlantOrderNummer
 		Set ReturnDocRefs.CommissieReferentie = OfferteDocRef.CommissieReferentie
+	}
 		
 	Quit ReturnDocRefs
 ]]></Implementation>
Index: vhUnitTest/APPS/VKP/OfferteDocumentReferentiesBepaler/GeefDocumentReferenties/Test.cls.xml
===================================================================
diff -u -r32748 -r32750
--- vhUnitTest/APPS/VKP/OfferteDocumentReferentiesBepaler/GeefDocumentReferenties/Test.cls.xml	(.../Test.cls.xml)	(revision 32748)
+++ vhUnitTest/APPS/VKP/OfferteDocumentReferentiesBepaler/GeefDocumentReferenties/Test.cls.xml	(.../Test.cls.xml)	(revision 32750)
@@ -27,6 +27,10 @@
 <Type>vhTest.Mock.APPS.VKP.Offerte</Type>
 </Property>
 
+<Property name="DocRefsVanHoeckeOfferte">
+<Type>DOM.VKP.DocumentReferenties</Type>
+</Property>
+
 <Method name="OnBeforeOneTest">
 <FormalSpec>aTestName:%String</FormalSpec>
 <Implementation><![CDATA[
@@ -40,6 +44,7 @@
 <Implementation><![CDATA[
 	// Assign 
 	#dim OrderMock As DOM.VKP.Order = ..GeefOrder(##class(BL.Flow.Offerte.enu.Oorsprong).UniShop(), ..#VanHoeckeOfferteID)
+	Do ..VanHoeckeOfferte.IndienMethodCall("GeefDocumentReferenties").DanReturn(..DocRefsVanHoeckeOfferte)
 	
 	// Act 
 	Set OfferteDocumentReferentiesBepaler = ##class(APPS.VKP.impl.OfferteDocumentReferentiesBepaler).%New()
@@ -55,6 +60,7 @@
 <Method name="TestGeenUnishopOfferte">
 <Implementation><![CDATA[
 	#dim OrderMock As DOM.VKP.Order = ..GeefOrder(##class(BL.Flow.Offerte.enu.Oorsprong).EDIBestand(), ..#VanHoeckeOfferteID)   ; "EDI" bewust gekozen, omdat Alpnach initieel besteld via EDI, maar het Order wordt weldegelijk gecreerd vanuit de Oorsprong Unishop. 
+	Do ..VanHoeckeOfferte.IndienMethodCall("GeefDocumentReferenties").DanReturn(..DocRefsVanHoeckeOfferte)
 	
 	Set OfferteDocumentReferentiesBepaler = ##class(APPS.VKP.impl.OfferteDocumentReferentiesBepaler).%New()
 	#dim List As %ListOfObjects = OfferteDocumentReferentiesBepaler.GeefDocumentReferenties(OrderMock)
@@ -63,26 +69,51 @@
 ]]></Implementation>
 </Method>
 
+<Method name="TestOfferteZonderDocRefsGeeftTochListItem">
+<Implementation><![CDATA[
+	#dim OrderMock As DOM.VKP.Order = ..GeefOrder(##class(BL.Flow.Offerte.enu.Oorsprong).UniShop(), ..#VanHoeckeOfferteID)
+	Do ..VanHoeckeOfferte.IndienMethodCall("GeefDocumentReferenties").DanReturn("")
+	
+	Set OfferteDocumentReferentiesBepaler = ##class(APPS.VKP.impl.OfferteDocumentReferentiesBepaler).%New()
+	#dim List As %ListOfObjects = OfferteDocumentReferentiesBepaler.GeefDocumentReferenties(OrderMock)
+	
+	If $$$AssertEquals(List.Count(), 1) {
+		Do ..AssertDocRefsLegeWaarden(List.GetAt(1))
+	}
+]]></Implementation>
+</Method>
+
+<Method name="AssertDocRefsLegeWaarden">
+<FormalSpec>DocRefs:APPS.VKP.impl.OfferteDocumentReferentiesBepaler.DocumentReferenties</FormalSpec>
+<Implementation><![CDATA[
+	If $$$AssertEquals($ClassName(DocRefs),"APPS.VKP.impl.OfferteDocumentReferentiesBepaler.DocumentReferenties") {
+		Do $$$AssertEquals(DocRefs.OrderReferentie,"")
+		Do $$$AssertEquals(DocRefs.KlantOrderNummer,"")
+		Do $$$AssertEquals(DocRefs.CommissieReferentie,"")
+	}
+]]></Implementation>
+</Method>
+
 <Method name="AssertDocRefsVanHoeckeOfferte">
 <FormalSpec>DocRefs:APPS.VKP.impl.OfferteDocumentReferentiesBepaler.DocumentReferenties</FormalSpec>
 <Implementation><![CDATA[
-	If $$$AssertEquals($ClassName(DocRefs),"APPS.VKP.impl.OfferteDocumentReferentiesBepaler.DocumentReferenties")
-	Do $$$AssertEquals(DocRefs.OrderReferentie    ,..#VanHoeckeOrderRef)
-	Do $$$AssertEquals(DocRefs.KlantOrderNummer   ,..#VanHoeckeKlantOrderNummer)
-	Do $$$AssertEquals(DocRefs.CommissieReferentie,..#VanHoeckeCommRef)
+	If $$$AssertEquals($ClassName(DocRefs),"APPS.VKP.impl.OfferteDocumentReferentiesBepaler.DocumentReferenties") {
+		Do $$$AssertEquals(DocRefs.OrderReferentie    ,..#VanHoeckeOrderRef)
+		Do $$$AssertEquals(DocRefs.KlantOrderNummer   ,..#VanHoeckeKlantOrderNummer)
+		Do $$$AssertEquals(DocRefs.CommissieReferentie,..#VanHoeckeCommRef)
+	}
 ]]></Implementation>
 </Method>
 
 <Method name="ZetMockVanHoeckeOfferte">
 <Private>1</Private>
 <Implementation><![CDATA[
-	Set DocRefsVanHoeckeOfferte = ##class(DOM.VKP.DocumentReferenties).%New()
-	Set DocRefsVanHoeckeOfferte.OrderReferentie     = ..#VanHoeckeOrderRef
-	Set DocRefsVanHoeckeOfferte.KlantOrderNummer    = ..#VanHoeckeKlantOrderNummer
-	Set DocRefsVanHoeckeOfferte.CommissieReferentie = ..#VanHoeckeCommRef
+	Set ..DocRefsVanHoeckeOfferte = ##class(DOM.VKP.DocumentReferenties).%New()
+	Set ..DocRefsVanHoeckeOfferte.OrderReferentie     = ..#VanHoeckeOrderRef
+	Set ..DocRefsVanHoeckeOfferte.KlantOrderNummer    = ..#VanHoeckeKlantOrderNummer
+	Set ..DocRefsVanHoeckeOfferte.CommissieReferentie = ..#VanHoeckeCommRef
 	
 	Set ..VanHoeckeOfferte = ##class(vhTest.Mock.APPS.VKP.Offerte).%New()
-	Do ..VanHoeckeOfferte.IndienMethodCall("GeefDocumentReferenties").DanReturn(DocRefsVanHoeckeOfferte)
 ]]></Implementation>
 </Method>