Index: includes/common.inc
===================================================================
RCS file: /cvs/drupal/drupal/includes/common.inc,v
retrieving revision 1.713
diff -u -r1.713 common.inc
--- includes/common.inc	14 Nov 2007 09:49:30 -0000	1.713
+++ includes/common.inc	14 Nov 2007 16:32:02 -0000
@@ -357,8 +357,8 @@
     $return = t('The requested page could not be found.');
   }
 
-  // To conserve CPU and bandwidth, omit the blocks.
-  print theme('page', $return, FALSE);
+  // Visibility of blocks is determined by admin setting and server load.
+  print theme('page', $return, variable_get('error_page_show_blocks', FALSE) && variable_get('throttle_level', 0) == 0);
 }
 
 /**
@@ -385,7 +385,9 @@
     drupal_set_title(t('Access denied'));
     $return = t('You are not authorized to access this page.');
   }
-  print theme('page', $return);
+
+  // Visibility of blocks is determined by admin setting and server load.
+  print theme('page', $return, variable_get('error_page_show_blocks', FALSE) && variable_get('throttle_level', 0) == 0);
 }
 
 /**
Index: modules/system/system.admin.inc
===================================================================
RCS file: /cvs/drupal/drupal/modules/system/system.admin.inc,v
retrieving revision 1.23
diff -u -r1.23 system.admin.inc
--- modules/system/system.admin.inc	9 Nov 2007 19:16:22 -0000	1.23
+++ modules/system/system.admin.inc	14 Nov 2007 16:33:58 -0000
@@ -1143,6 +1143,13 @@
     '#options' => array(t('Write errors to the log'), t('Write errors to the log and to the screen')),
     '#description' =>  t('Specify where Drupal, PHP and SQL errors are logged. While it is recommended that a site running in a production environment write errors to the log only, in a development or testing environment it may be helpful to write errors both to the log and to the screen.')
   );
+  
+  $form['error_page_show_blocks'] = array(
+    '#type' => 'checkbox',
+    '#title' => t('Display Blocks'),
+    '#default_value' => variable_get('error_page_show_blocks', FALSE),
+    '#description' => t('Show the blocks on error reporting pages.')
+  );
 
   return system_settings_form($form);
 }