Index: WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml
===================================================================
diff -u -r44058 -r44777
--- WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 44058)
+++ WSimpl/AX/CalculatedProduct/RequestConverter.cls.xml	(.../RequestConverter.cls.xml)	(revision 44777)
@@ -58,7 +58,7 @@
 		}
 	}
 
-	If (..ProductApi.BestaatProduct(ProductId)) {
+	If ($$$Not(ProductId = "") && (..ProductApi.BestaatProduct(ProductId))) {
 		#dim Product As DOM.PM.Product = ..ProductApi.GeefProduct(ProductId)
 
 		Set ConfigVariant.GTIN = Product.GeefEANCode()
Index: vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml
===================================================================
diff -u -r44058 -r44777
--- vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 44058)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/RequestConverter/Test.cls.xml	(.../Test.cls.xml)	(revision 44777)
@@ -68,6 +68,16 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: RequestConverter vult ErrorText in indien geen ProductId opgegeven">
+<Implementation><![CDATA[
+	#dim Request As AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest = ##class(AXif.Dynamics.CalculatedProductIn.MessageParts.AxdEntityRequest).%New()
+	#dim RequestConverter As WSimpl.AX.CalculatedProduct.RequestConverter = ##class(WSimpl.AX.CalculatedProduct.RequestConverter).%New()
+	#dim ConfigVariant As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityConfigVariant = RequestConverter.Convert(Request, "RandomMessageId")
+	
+	Do $$$AssertEquals(ConfigVariant.ErrorText, ##class(WSimpl.AX.CalculatedProduct.Converter.enu.ErrorText).NotFound())
+]]></Implementation>
+</Method>
+
 <Method name="Test: RequestConverter vult MessageId altijd in">
 <Implementation><![CDATA[
 	#dim ProductApiStub As vhTest.Mock.DOM.PM.ProductAPI = ##class(vhTest.Mock.DOM.PM.ProductAPI).%New()