--- nodewords.module	2010-01-28 16:54:22.000000000 -0800
+++ nodewords.module	2010-01-28 16:54:34.000000000 -0800
@@ -548,27 +548,34 @@ function nodewords_preprocess_page(&$var
  * Implements hook_taxonomy().
  */
 function nodewords_taxonomy($op, $type, $object = NULL) {
-  if ($type == NODEWORDS_TYPE_TERM) {
-    $id = $object['tid'];
-  }
-  elseif ($type == NODEWORDS_TYPE_VOCABULARY) {
-    $id = $object['vid'];
-  }
-  else {
-    return;
-  }
-
-  switch ($op) {
-    case 'delete':
-      nodewords_delete_tags($type, $id);
-      break;
-
-    case 'insert':
-    case 'update':
-      if (isset($object['nodewords'])) {
-        nodewords_save_tags($type, $id, $object['nodewords'], TRUE);
-      }
-      break;
+  if (isset($object)) {
+    switch ($type) {
+      case 'term':
+        $type = NODEWORDS_TYPE_TERM;
+        $id = $object['tid'];
+        break;
+
+      case 'vocabulary':
+        $type = NODEWORDS_TYPE_VOCABULARY;
+        $id = $object['vid'];
+        break;
+
+      default:
+        return;
+    }
+ 
+    switch ($op) {
+      case 'delete':
+        nodewords_delete_tags($type, $id);
+        break;
+
+      case 'insert':
+      case 'update':
+        if (isset($object['nodewords'])) {
+          nodewords_save_tags($type, $id, $object['nodewords'], TRUE);
+        }
+        break;
+    }
   }
 }