Fixed issue where vat number could be nil instead of empty