diff --git a/file_entity/file_entity.admin.inc b/file_entity/file_entity.admin.inc
index 3ee0743..018474e 100644
--- a/file_entity/file_entity.admin.inc
+++ b/file_entity/file_entity.admin.inc
@@ -113,8 +113,8 @@ function file_entity_file_display_form($form, &$form_state, $file_type, $view_mo
   $i=0;
   foreach ($formatters as $name => $formatter) {
     if (isset($formatter['settings callback']) && ($function = $formatter['settings callback']) && function_exists($function)) {
-      $defaults = isset($formatter['default settings']) ? $formatter['default settings'] : array();
-      $settings = isset($current_displays[$name]['settings']) ? $current_displays[$name]['settings'] : array();
+      $defaults = (isset($formatter['default settings'] ) && is_array($formatter['default settings'] )) ? $formatter['default settings'] : array();
+      $settings = (isset($current_displays[$name]['settings']) && is_array($current_displays[$name]['settings'])) ? $current_displays[$name]['settings'] : array();
       $settings += $defaults;
       $settings_form = $function($form, $form_state, $settings, $name, $file_type, $view_mode);
       if (!empty($settings_form)) {
diff --git a/includes/media.fields.inc b/includes/media.fields.inc
index 36959ba..e2a12bf 100644
--- a/includes/media.fields.inc
+++ b/includes/media.fields.inc
@@ -83,7 +83,7 @@ function media_field_formatter_settings_form($field, $instance, $view_mode, $for
 
   $element = array();
 
-  if ($display['type'] == 'media') {
+  if (isset($display['type']) && $display['type'] == 'media') {
     $entity_info = entity_get_info('file');
     $options = array('default' => t('Default'));
     foreach ($entity_info['view modes'] as $file_view_mode => $file_view_mode_info) {
@@ -300,7 +300,7 @@ function media_field_validate($obj_type, $object, $field, $instance, $langcode,
  */
 function media_field_widget_value($element, $input, $form_state) {
   $return = $input;
-  
+
   if (!is_array($return)) {
     $return = array();
   }
@@ -360,13 +360,13 @@ function media_field_update($entity_type, $entity, $field, $instance, $langcode,
     }
     return;
   }
-  
+
   // Build a display of the current FIDs.
   $current_fids = array();
   foreach ($items as $item) {
     $current_fids[] = $item['fid'];
   }
-  
+
   // Create a bare-bones entity so that we can load its previous values.
   $original = entity_create_stub_entity($entity_type, array($id, $vid, $bundle));
   field_attach_load($entity_type, array($id => $original), FIELD_LOAD_CURRENT, array('field_id' => $field['id']));