diff --git a/modules/field/field.info.inc b/modules/field/field.info.inc
index 77e9b44..72e074b 100644
--- a/modules/field/field.info.inc
+++ b/modules/field/field.info.inc
@@ -593,9 +593,11 @@ function field_info_bundles($entity_type = NULL) {
 function field_info_fields() {
   $fields = array();
   $info = _field_info_collate_fields();
-  foreach ($info['fields'] as $key => $field) {
-    if (!$field['deleted']) {
-      $fields[$field['field_name']] = $field;
+  if (is_array($info['fields'])) {
+    foreach ($info['fields'] as $key => $field) {
+      if (!$field['deleted']) {
+        $fields[$field['field_name']] = $field;
+      }
     }
   }
   return $fields;