file_type_get_names() doesn't always return an array, yet it is assumed that it does

If no file types are defined, or returned by entity_get_info('file'), which seems to be the case during features update/revert commands run through drush, file_type_get_names() returns null. This results in numerous warnings stating:

Invalid argument supplied for foreach() file_entity.module:466

The function currently looks like:

function file_type_get_names() {
  $names = &drupal_static(__FUNCTION__);

  if (!isset($names)) {
    $info = entity_get_info('file');
    foreach ($info['bundles'] as $bundle => $bundle_info) {
      $names[$bundle] = $bundle_info['label'];
    }
  }

  return $names;
}

In hook_field_extra_fields(), it is assumed that an array is retuned:

function file_entity_field_extra_fields() {
  $info = array();

  foreach (file_type_get_names() as $type => $name) {
    $info['file'][$type]['form']['filename'] = array(
      'label' => t('File name'),
      ...

One or another needs to be changed.