diff --git a/entity_view_mode.module b/entity_view_mode.module
index 9e73b77..cc67bfc 100644
--- a/entity_view_mode.module
+++ b/entity_view_mode.module
@@ -182,10 +182,9 @@ function field_entity_view_mode_update($view_mode, $entity_type) {
       // settings.
       $view_mode_settings = field_view_mode_settings($entity_type, $bundle);
       if (!empty($value) && empty($view_mode_settings[$view_mode_name]['custom_settings'])) {
-        $view_mode_label = $entity_info['view modes'][$view_mode_name]['label'];
         $path = _field_ui_bundle_admin_path($entity_type, $bundle) . "/display/$view_mode_name";
         drupal_set_message(t('The %view_mode @entity_type @bundle view mode now uses custom display settings. You might want to <a href="@url" target="_new">configure them</a>.', array(
-          '%view_mode' => $view_mode_label,
+          '%view_mode' => $view_mode['label'],
           '@entity_type' => $entity_info['label'],
           '@bundle' => $entity_info['bundles'][$bundle]['label'],
           '@url' => url($path),
@@ -213,7 +212,7 @@ function field_entity_view_mode_delete($view_mode, $entity_type) {
     // Remove bundle settings for the view mode.
     $bundle_settings = field_bundle_settings($entity_type, $bundle);
     if (isset($bundle_settings['view_modes'][$view_mode_name])) {
-      unset($bundles_settings['view_modes'][$view_mode_name]);
+      unset($bundle_settings['view_modes'][$view_mode_name]);
       field_bundle_settings($entity_type, $bundle, $bundle_settings);
     }