--- http://drupalcode.org/viewvc/drupal/drupal/modules/toolbar/toolbar.module	2010/01/30 07:59:26	1.34
+++ http://drupalcode.org/viewvc/drupal/drupal/modules/toolbar/toolbar.module	2010/03/10 14:46:23	1.35
@@ -142,7 +142,7 @@
  * Add some page classes, so global page theming can adjust to the toolbar.
  */
 function toolbar_preprocess_html(&$vars) {
-  if (user_access('access toolbar')) {
+  if (isset($vars['page_top']['toolbar']) && user_access('access toolbar')) {
     $vars['classes_array'][] = 'toolbar';
     if (!_toolbar_is_collapsed()) {
       $vars['classes_array'][] = 'toolbar-drawer';