diff --git entity_metadata/entity_metadata.module entity_metadata/entity_metadata.module
index 8e7b415..02d8ebe 100644
--- entity_metadata/entity_metadata.module
+++ entity_metadata/entity_metadata.module
@@ -221,21 +221,43 @@ function entity_metadata_get_list($data, array $options, $name) {
  */
 function entity_metadata_field_info_alter(&$field_info) {
   // Field API lists are key/value pairs but not multiple valued by default.
-  $field_info['list']['property_type'] = 'integer';
-  $field_info['list_boolean']['property_type'] = 'boolean';
-  $field_info['list_number']['property_type'] = 'decimal';
-  $field_info['list_text']['property_type'] = 'text';
-  $field_info['number_integer']['property_type'] = 'integer';
-  $field_info['number_decimal']['property_type'] = 'decimal';
-  $field_info['number_float']['property_type'] = 'decimal';
-  $field_info['text']['property_type'] = 'text';
-  $field_info['text']['property_callbacks'] = array('entity_metadata_field_text_property_callback');
-  $field_info['text_long']['property_type'] = 'text';
-  $field_info['text_long']['property_callbacks'] = array('entity_metadata_field_text_property_callback');
-  $field_info['text_with_summary']['property_type'] = 'text';
-  $field_info['text_with_summary']['property_callbacks'] = array('entity_metadata_field_text_property_callback');
-  $field_info['taxonomy_term_reference']['property_type'] = 'taxonomy_term';
-  $field_info['taxonomy_term_reference']['property_callbacks'] = array('entity_metadata_field_term_reference_callback');
+  if (isset($field_info['list'])) {
+    $field_info['list']['property_type'] = 'integer';
+  }
+  if (isset($field_info['list_boolean'])) {
+    $field_info['list_boolean']['property_type'] = 'boolean';
+  }
+  if (isset($field_info['list_number'])) {
+    $field_info['list_number']['property_type'] = 'decimal';
+  }
+  if (isset($field_info['list_text'])) {
+    $field_info['list_text']['property_type'] = 'text';
+  }
+  if (isset($field_info['number_integer'])) {
+    $field_info['number_integer']['property_type'] = 'integer';
+  }
+  if (isset($field_info['number_decimal'])) {
+    $field_info['number_decimal']['property_type'] = 'decimal';
+  }
+  if (isset($field_info['number_float'])) {
+    $field_info['number_float']['property_type'] = 'decimal';
+  }
+  if (isset($field_info['text'])) {
+    $field_info['text']['property_type'] = 'text';
+    $field_info['text']['property_callbacks'] = array('entity_metadata_field_text_property_callback');
+  }
+  if (isset($field_info['text_long'])) {
+    $field_info['text_long']['property_type'] = 'text';
+    $field_info['text_long']['property_callbacks'] = array('entity_metadata_field_text_property_callback');
+  }
+  if (isset($field_info['text_with_summary'])) {
+    $field_info['text_with_summary']['property_type'] = 'text';
+    $field_info['text_with_summary']['property_callbacks'] = array('entity_metadata_field_text_property_callback');
+  }
+  if (isset($field_info['taxonomy_term_reference'])) {
+    $field_info['taxonomy_term_reference']['property_type'] = 'taxonomy_term';
+    $field_info['taxonomy_term_reference']['property_callbacks'] = array('entity_metadata_field_term_reference_callback');
+  }
 }
 
 /**