--- includes/common.inc.orig	2006-01-26 19:32:55.000000000 +0800
+++ includes/common.inc	2006-01-26 19:33:35.000000000 +0800
@@ -256,10 +256,10 @@
   drupal_set_header('HTTP/1.0 404 Not Found');
   watchdog('page not found', t('%page not found.', array('%page' => theme('placeholder', $_GET['q']))), WATCHDOG_WARNING);
 
-  $path = drupal_get_normal_path(variable_get('site_404', ''));
+  $path = variable_get('site_404', '');
   $status = MENU_NOT_FOUND;
   if ($path && $path != $_GET['q']) {
-    menu_set_active_item($path);
+    menu_set_active_item(drupal_get_normal_path($path));
     $return = menu_execute_active_handler();
   }
 
@@ -276,10 +276,10 @@
   drupal_set_header('HTTP/1.0 403 Forbidden');
   watchdog('access denied', t('%page denied access.', array('%page' => theme('placeholder', $_GET['q']))), WATCHDOG_WARNING, l(t('view'), $_GET['q']));
 
-  $path = drupal_get_normal_path(variable_get('site_403', ''));
+  $path = variable_get('site_403', '');
   $status = MENU_NOT_FOUND;
   if ($path && $path != $_GET['q']) {
-    menu_set_active_item($path);
+    menu_set_active_item(drupal_get_normal_path($path));
     $return = menu_execute_active_handler();
   }