Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.710
diff -u -p -r1.710 common.inc
--- includes/common.inc	4 Nov 2007 21:24:09 -0000	1.710
+++ includes/common.inc	12 Nov 2007 20:42:29 -0000
@@ -352,9 +352,9 @@ function drupal_not_found() {
     $return = menu_execute_active_handler($path);
   }
 
-  if (empty($return)) {
+  if (empty($return) || $return == MENU_NOT_FOUND || $return == MENU_ACCESS_DENIED) {
     drupal_set_title(t('Page not found'));
-    $return = '';
+    $return = t('The requested page could not be found.');
   }
 
   // To conserve CPU and bandwidth, omit the blocks.
@@ -381,7 +381,7 @@ function drupal_access_denied() {
     $return = menu_execute_active_handler($path);
   }
 
-  if (empty($return)) {
+  if (empty($return) || $return == MENU_NOT_FOUND || $return == MENU_ACCESS_DENIED) {
     drupal_set_title(t('Access denied'));
     $return = t('You are not authorized to access this page.');
   }