Index: modules/taxonomy.module
===================================================================
RCS file: /cvs/drupal/drupal/modules/taxonomy.module,v
retrieving revision 1.253
diff -u -p -r1.253 taxonomy.module
--- modules/taxonomy.module	17 Jan 2006 09:23:38 -0000	1.253
+++ modules/taxonomy.module	18 Jan 2006 12:28:26 -0000
@@ -644,7 +644,10 @@ function taxonomy_node_save($nid, $terms
           }
         }
       }
-      else if ($term) {
+      elseif (isset($term->tid)) {
+        db_query('INSERT INTO {term_node} (nid, tid) VALUES (%d, %d)', $nid, $term->tid);
+      }
+      elseif ($term) {
         db_query('INSERT INTO {term_node} (nid, tid) VALUES (%d, %d)', $nid, $term);
       }
     }