diff --git a/modules/field/field.module b/modules/field/field.module
index 4331cdf..676e3f4 100644
--- a/modules/field/field.module
+++ b/modules/field/field.module
@@ -934,7 +934,10 @@ function field_view_field($entity_type, $entity, $field_name, $display = array()
  */
 function field_get_items($entity_type, $entity, $field_name, $langcode = NULL) {
   $langcode = field_language($entity_type, $entity, $field_name, $langcode);
-  return isset($entity->{$field_name}[$langcode]) ? $entity->{$field_name}[$langcode] : FALSE;
+  if (isset($entity->{$field_name}[$langcode]) && is_array($entity->{$field_name}[$langcode])) {
+    return $entity->{$field_name}[$langcode];
+  }
+  return FALSE;
 }
 
 /**