Index: vhUnitTest/AX/Uitgaand/Klant/impl/AifConverter.cls.xml
===================================================================
diff -u -r33696 -r33703
--- vhUnitTest/AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33696)
+++ vhUnitTest/AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33703)
@@ -358,6 +358,45 @@
 ]]></Implementation>
 </Method>
 
+<Method name="Test: BTW variaties - G">
+<Implementation><![CDATA[
+	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("G")
+	
+	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	do $$$AssertEquals(CustTable.EnterpriseNumber,"")
+	do $$$AssertEquals(CustTable.VATNum,"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: BTW variaties - GEEN">
+<Implementation><![CDATA[
+	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("GEEN")
+	
+	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	do $$$AssertEquals(CustTable.EnterpriseNumber,"")
+	do $$$AssertEquals(CustTable.VATNum,"")
+]]></Implementation>
+</Method>
+
+<Method name="Test: BTW variaties - BE met nullen">
+<Implementation><![CDATA[
+	do ..Partij.IndienMethodCall("GeefBTWNr").DanReturn("BE0000000000")
+	
+	set Converter = ##class(AX.Uitgaand.Klant.impl.AifConverter).%New()
+	#dim AxKlant As AXaif.Customer.AxdCustomer = Converter.Convert(..Partij,..Klant)
+	
+	#dim CustTable As AXaif.Customer.AxdEntityCustTable = AxKlant.CustTable.GetAt(1)
+	do $$$AssertEquals(CustTable.EnterpriseNumber,"")
+	do $$$AssertEquals(CustTable.VATNum,"0000.000.000")
+]]></Implementation>
+</Method>
+
 <Method name="Test: TaxGroup - Een van de specifieke klantnrs">
 <Implementation><![CDATA[
 	do ..Partij.IndienMethodCall("GeefID").DanReturn("K||7587")
Index: AX/Uitgaand/Klant/impl/AifConverter.cls.xml
===================================================================
diff -u -r33696 -r33703
--- AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33696)
+++ AX/Uitgaand/Klant/impl/AifConverter.cls.xml	(.../AifConverter.cls.xml)	(revision 33703)
@@ -118,6 +118,7 @@
 <Implementation><![CDATA[
 	quit:$$$Not($$$StartsWith(BTWNr,"BE")) ""
 	quit:BTWNr="" ""
+	quit:(+$extract(BTWNr,3,*))=0 ""
 	quit "BTW "_$extract(BTWNr,1,2)_" "_$extract(BTWNr,3,6)_"."_$extract(BTWNr,7,9)_"."_$extract(BTWNr,10,12)
 ]]></Implementation>
 </Method>
@@ -128,6 +129,8 @@
 <ReturnType>%String</ReturnType>
 <Implementation><![CDATA[
 	quit:BTWNr="" ""
+	quit:BTWNr="GEEN" ""
+	quit:BTWNr="G" ""
 	quit:$$$Not($$$StartsWith(BTWNr,"BE")) BTWNr
 	quit $extract(BTWNr,3,6)_"."_$extract(BTWNr,7,9)_"."_$extract(BTWNr,10,12)
 ]]></Implementation>