Index: vhUnitTest/WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/DescriptionBepaler/Test.cls.xml
===================================================================
diff -u -r60088 -r60148
--- vhUnitTest/WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/DescriptionBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 60088)
+++ vhUnitTest/WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/DescriptionBepaler/Test.cls.xml	(.../Test.cls.xml)	(revision 60148)
@@ -61,10 +61,11 @@
 
 	Do ProductTypeAPIStub.IndienMethodCall("IsTaxLosseComponentenProduct",RandomProductId).DanReturn($$$False)
 	Do ProductMock.VerwachtMethodCall("GeefID").DanReturn(RandomProductId)
-	Do ProductMock.VerwachtMethodCall("GeefLangtekst",RandomTaal,$$$False).DanReturn("")	
+	Do ProductMock.VerwachtMethodCall("GeefLangtekst",RandomTaal,$$$False).DanReturn("")
+	Do ProductMock.VerwachtMethodCall("GeefKleurVanKorttekst").DanReturn("")	
 	
-	Do VertalerMock.VerwachtMethodCall("GeefVertaling","Kleur",RandomTaal,0).Nooit()
-	Do ProductMock.VerwachtMethodCall("GeefKleurOmschrijving",RandomTaal).Nooit()
+	Do VertalerMock.VerwachtMethodCall("GeefVertaling","Kleur",RandomTaal,0).DanReturn("")
+	Do ProductMock.VerwachtMethodCall("GeefKleurOmschrijving",RandomTaal).DanReturn("")
 	
 	Set DescriptionBepaler = ##class(WSimpl.AX.CalculatedProduct.VariantDescriptionBepaler.DescriptionBepaler).%New(ProductTypeAPIStub, VertalerMock, PlaatMateriaalKleurVertalerStub)
 	#dim ResultaatOmschrijving As %String = DescriptionBepaler.GeefDescription(ProductMock,RandomTaal)
Index: WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/DescriptionBepaler.cls.xml
===================================================================
diff -u -r60018 -r60148
--- WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/DescriptionBepaler.cls.xml	(.../DescriptionBepaler.cls.xml)	(revision 60018)
+++ WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler/DescriptionBepaler.cls.xml	(.../DescriptionBepaler.cls.xml)	(revision 60148)
@@ -49,11 +49,7 @@
 	
 	Set DescriptionLangtekst = Product.GeefLangtekst(Taal, $$$False)
 	
-	If DescriptionLangtekst = "" {
-		Quit ""
-	} Else {
-		Set Description = Description _ DescriptionLangtekst
-	}
+	Set Description = Description _ DescriptionLangtekst	
 	
 	#dim KleurLabel As %String = ..Vertaler.GeefVertaling("Kleur", Taal)
 
@@ -68,8 +64,12 @@
 	If $$$Not(Kleur = "") {
 		Set Description = Description _ $$$CRLF _ KleurLabel _ ":" _ Kleur
 	}
-
-	Quit Description
+	
+	If DescriptionLangtekst = "" {
+		Quit ""
+	} Else {
+		Quit Description
+	}
 ]]></Implementation>
 </Method>
 </Class>
Index: WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler.cls.xml
===================================================================
diff -u -r60018 -r60148
--- WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler.cls.xml	(.../VariantDescriptionBepaler.cls.xml)	(revision 60018)
+++ WSimpl/AX/CalculatedProduct/VariantDescriptionBepaler.cls.xml	(.../VariantDescriptionBepaler.cls.xml)	(revision 60148)
@@ -37,16 +37,16 @@
 	#dim VariantDescriptionEN As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityVariantDescription = ..GeefVariantDescription(Product, ##class(DOM.enu.Taal).Engels(), ConfigVariantId)
 	#dim VariantDescriptionDU As AXif.Dynamics.CalculatedProductOut.MessageParts.AxdEntityVariantDescription = ..GeefVariantDescription(Product, ##class(DOM.enu.Taal).Duits(), ConfigVariantId)
 	
-	If $$$Not(VariantDescriptionNL.Description = "") {
+	If $$$HasLength(VariantDescriptionNL.Description) {
 		Do VariantDescriptionList.Insert(VariantDescriptionNL)
 	}
-	If $$$Not(VariantDescriptionFR.Description = "") {
+	If $$$HasLength(VariantDescriptionFR.Description) {
 		Do VariantDescriptionList.Insert(VariantDescriptionFR)
 	}
-	If $$$Not(VariantDescriptionEN.Description = "") {
+	If $$$HasLength(VariantDescriptionEN.Description) {
 		Do VariantDescriptionList.Insert(VariantDescriptionEN)
 	}
-	If $$$Not(VariantDescriptionDU.Description = "") {
+	If $$$HasLength(VariantDescriptionDU.Description) {
 		Do VariantDescriptionList.Insert(VariantDescriptionDU)
 	}