Index: modules/taxonomy/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy/taxonomy.module,v
retrieving revision 1.425
diff -u -r1.425 taxonomy.module
--- modules/taxonomy/taxonomy.module	24 Jul 2008 16:25:19 -0000	1.425
+++ modules/taxonomy/taxonomy.module	23 Aug 2008 17:42:27 -0000
@@ -1181,12 +1181,15 @@
  * Implementation of hook_nodeapi('update_index').
  */
 function taxonomy_node_update_index(&$node) {
-  $output = array();
-  foreach ($node->taxonomy as $term) {
-    $output[] = $term->name;
-  }
-  if (count($output)) {
-    return '<strong>(' . implode(', ', $output) . ')</strong>';
+  if (is_object($node) && property_exists($node, 'taxonomy') &&
+      is_array($node->taxonomy)) {
+    $output = array();
+    foreach ($node->taxonomy as $term) {
+      $output[] = $term->name;
+    }
+    if (count($output)) {
+      return '<strong>('. implode(', ', $output) .')</strong>';
+    }
   }
 }