diff --git a/modules/field/field.info.inc b/modules/field/field.info.inc
index 6b172dd..f2d41e5 100644
--- a/modules/field/field.info.inc
+++ b/modules/field/field.info.inc
@@ -678,7 +678,7 @@ function field_info_instances($entity_type = NULL, $bundle_name = NULL) {
   if (!isset($entity_type)) {
     return $info['instances'];
   }
-  if (!isset($bundle_name)) {
+  if (!isset($bundle_name) && !empty($info['instances'][$entity_type])) {
     return $info['instances'][$entity_type];
   }
   if (isset($info['instances'][$entity_type][$bundle_name])) {