Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.650
diff -u -r1.650 common.inc
--- includes/common.inc	1 Jun 2007 09:49:11 -0000	1.650
+++ includes/common.inc	1 Jun 2007 19:35:39 -0000
@@ -345,9 +345,9 @@
     $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
   print theme('page', $return, FALSE);
@@ -370,7 +370,7 @@
     $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.');
   }