--- taxonomy_menu.inc	2008-01-31 08:23:34.000000000 -0800
+++ taxonomy_menu.inc.new	2008-06-20 05:32:57.000000000 -0700
@@ -58,7 +58,7 @@ function _taxonomy_menu_admin() {
     // In case of View options selected, select Views
     if (module_exists('views')) {
       $form[$vocab->vid]['taxonomy_menu_show_view_'. $vocab->vid] = array(
-        '#default_value'  => variable_get('taxonomy_menu_show_view_'. $vocab->vid, ''),
+        '#default_value'  => variable_get('taxonomy_menu_show_views_'. $vocab->vid, ''),
         '#options'        => $views_list,
         '#title'          => t('Views available'),
         '#type'           => 'select'
@@ -277,13 +277,14 @@ function _taxonomy_menu_page() {
         $arguments[] = $tid;
       }
 
+      $view = views_get_view(variable_get('taxonomy_menu_show_views_'. $vid, ''));
+      $view_empty_text = $view->page_empty;
+
       // Embed the views output into the page
-      $output = views_build_view('embed',
-        views_get_view(variable_get('taxonomy_menu_show_views_'. $vid, '')),
-        $arguments, FALSE, NULL);
+      $output = views_build_view('embed', $view, $arguments, FALSE, NULL);
     }
   }
 
   // If no content found, return a "error" message
-  return empty($output) ? t('No content for this category.') : $output;
+  return empty($output) ? ($view_empty_text ? $view_empty_text : t('No content for this category.')) : $output;
 }