diff --git a/addressfield.tokens.inc b/addressfield.tokens.inc
index 15c5774..3e09ecc 100644
--- a/addressfield.tokens.inc
+++ b/addressfield.tokens.inc
@@ -108,6 +108,10 @@ function addressfield_token_info_alter(&$data) {
 function addressfield_tokens($type, $tokens, array $data = array(), array $options = array()) {
   if (isset($options['language'])) {
     $language_code = $options['language']->language;
+    // For address fields, double check that the language code is supported.
+    if ($type == 'address-field' && empty($data['address-field'][$language_code])) {
+      $language_code = LANGUAGE_NONE;
+    }
   }
   else {
     $language_code = LANGUAGE_NONE;