diff --git a/media_gallery.install b/media_gallery.install
index c3d7123..415fb20 100644
--- a/media_gallery.install
+++ b/media_gallery.install
@@ -50,20 +50,24 @@ function media_gallery_install() {
   // instances in media entity bundles.
   // @todo Add a hook_update() function for 'video'.
   foreach (array('image', 'video') as $bundle) {
-    $bundle_settings = field_bundle_settings('media', $bundle);
+    $bundle_settings = field_bundle_settings('file', $bundle);
     $bundle_settings['view_modes']['media_gallery_thumbnail']['custom_settings'] = TRUE;
     $bundle_settings['view_modes']['media_gallery_lightbox']['custom_settings'] = TRUE;
     $bundle_settings['view_modes']['media_gallery_detail']['custom_settings'] = TRUE;
     $bundle_settings['view_modes']['media_gallery_block_thumbnail']['custom_settings'] = TRUE;
     $bundle_settings['view_modes']['media_gallery_collection_thumbnail']['custom_settings'] = TRUE;
-    field_bundle_settings('media', $bundle, $bundle_settings);
-    $instance = field_info_instance('media', 'file', $bundle);
+    field_bundle_settings('file', $bundle, $bundle_settings);
+    /*
+    // @todo There's no 'file' field on file entities anymore. This code breaks
+    //   with a fatal error during installation. 08/05/2011 sun
+    $instance = field_info_instance('file', 'file', $bundle);
     $instance['display']['media_gallery_thumbnail'] = array('type' => 'styles_file_media_gallery_thumbnail', 'label' => 'hidden');
     $instance['display']['media_gallery_lightbox'] = array('type' => 'styles_file_media_gallery_large', 'label' => 'hidden');
     $instance['display']['media_gallery_detail'] = array('type' => 'styles_file_media_gallery_large', 'label' => 'hidden');
     $instance['display']['media_gallery_block_thumbnail'] = array('type' => 'styles_file_media_gallery_thumbnail', 'label' => 'hidden');
     $instance['display']['media_gallery_collection_thumbnail'] = array('type' => 'styles_file_media_gallery_thumbnail', 'label' => 'hidden');
     field_update_instance($instance);
+    */
   }
 
   // Clear caches so that our implementation of hook_image_default_styles() is
diff --git a/media_gallery.module b/media_gallery.module
index d6e0ff5..57bbc7d 100644
--- a/media_gallery.module
+++ b/media_gallery.module
@@ -796,9 +796,11 @@ function media_gallery_remove_item_from_gallery($node, $media) {
 function media_gallery_entity_info_alter(&$info) {
   // For each media field formatter we add, we also need to add the
   // corresponding media entity view mode.
-  foreach (media_gallery_field_formatter_info() as $formatter_name => $formatter_info) {
-    if (in_array('media', $formatter_info['field types'])) {
-      $info['media']['view modes'][$formatter_name] = array('label' => $formatter_info['label'], 'custom settings' => FALSE);
+  if (isset($info['media'])) {
+    foreach (media_gallery_field_formatter_info() as $formatter_name => $formatter_info) {
+      if (in_array('media', $formatter_info['field types'])) {
+        $info['media']['view modes'][$formatter_name] = array('label' => $formatter_info['label'], 'custom settings' => FALSE);
+      }
     }
   }
   // Add a view mode for displaying a node in a media gallery block.