Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.575
diff -u -r1.575 common.inc
--- includes/common.inc	7 Sep 2006 08:23:54 -0000	1.575
+++ includes/common.inc	17 Sep 2006 19:26:40 -0000
@@ -336,8 +336,11 @@
     menu_set_active_item('');
   }
 
-  if (empty($return)) {
+  if (empty($return) || $return == MENU_NOT_FOUND || $return == MENU_ACCESS_DENIED) {
     drupal_set_title(t('Page not found'));
+    menu_set_active_item('');
+
+    $return = 'The requested page could not be found.';
   }
   // To conserve CPU and bandwidth, omit the blocks
   print theme('page', $return, FALSE);
@@ -365,8 +368,10 @@
     menu_set_active_item('');
   }
 
-  if (empty($return)) {
+  if (empty($return) || $return == MENU_NOT_FOUND || $return == MENU_ACCESS_DENIED) {
     drupal_set_title(t('Access denied'));
+    menu_set_active_item('');
+
     $return = t('You are not authorized to access this page.');
   }
   print theme('page', $return);