Index: DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml
===================================================================
diff -u -r36446 -r41923
--- DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml	(.../DataMBonAbstract.cls.xml)	(revision 36446)
+++ DOM/VKP/impl/DataM/DataMBonAbstract.cls.xml	(.../DataMBonAbstract.cls.xml)	(revision 41923)
@@ -319,7 +319,7 @@
 	#dim FactuurID As %String = ""
 	#dim ID As %String = $piece(^KU1(..BonNummer,"F"),"\",2)
 	Quit:$piece(^KU1(..BonNummer,"F"),"\",3)="P" ""
-	Set:(##class(DOM.DomeinContext).Instance().GeefOrderAPI().BestaatFactuur(ID)) FactuurID = ID
+	Set:$$$HasLength(ID)&&(##class(DOM.DomeinContext).Instance().GeefOrderAPI().BestaatFactuur(ID)) FactuurID = ID
 	Quit FactuurID
 ]]></Implementation>
 </Method>
@@ -330,7 +330,7 @@
 	#dim ProformaID As %String = ""
 	#dim ID As %String = $piece(^KU1(..BonNummer,"F"),"\",2)
 	Quit:$piece(^KU1(..BonNummer,"F"),"\",3)'="P" ""
-	Set:(##class(DOM.DomeinContext).Instance().GeefOrderAPI().BestaatProforma(ID)) ProformaID = ID
+	Set:$$$HasLength(ID)&&(##class(DOM.DomeinContext).Instance().GeefOrderAPI().BestaatProforma(ID)) ProformaID = ID
 	Quit ProformaID
 ]]></Implementation>
 </Method>