Index: addresses.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/addresses/addresses.inc,v
retrieving revision 1.62
diff -u -r1.62 addresses.inc
--- addresses.inc	29 Jan 2010 15:27:36 -0000	1.62
+++ addresses.inc	16 Feb 2010 11:06:14 -0000
@@ -665,12 +665,20 @@
     }
   }
 
+  // Generate the empty address
+  $empty_address = preg_replace('/\[\S*\]/', '', $address_format);
+
   // Replace all addresses_adr tokens with their values
   $address_format = token_replace($address_format, 'addresses_adr', $afields);
 
   // Replace al addresses_general tokens with their values
   $address_format = token_replace($address_format, 'addresses_general', $afields);
 
+  // all fields are empty, return ''
+  if (trim($empty_address) == trim($address_format)) {
+    return ''
+  }
+
   // Replace new lines with the HTML <br /> tag and remove empty lines
   $address_format = explode("\n", $address_format);
   foreach (array_keys($address_format) as $line) {