diff --git a/modules/taxonomy/taxonomy.module b/modules/taxonomy/taxonomy.module
index 5cddca6ba5c..94ea2abcece 100644
--- a/modules/taxonomy/taxonomy.module
+++ b/modules/taxonomy/taxonomy.module
@@ -1546,14 +1546,14 @@ function taxonomy_implode_tags($tags, $vid = NULL) {
   $typed_tags = array();
   foreach ($tags as $tag) {
     // Extract terms belonging to the vocabulary in question.
-    if (is_null($vid) || $term->vid == $vid) {
+    if (is_null($vid) || $tag->vid == $vid) {
 
-      // Commas and quotes in terms are special cases, so encode 'em.
-      if (strpos($term->name, ',') !== FALSE || strpos($term->name, '"') !== FALSE) {
-        $term->name = '"'. str_replace('"', '""', $term->name) .'"';
+      // Commas and quotes in tag names are special cases, so encode 'em.
+      if (strpos($tag->name, ',') !== FALSE || strpos($tag->name, '"') !== FALSE) {
+        $tag->name = '"'. str_replace('"', '""', $tag->name) .'"';
       }
 
-      $typed_tags[] = $term->name;
+      $typed_tags[] = $tag->name;
     }
   }
   return implode(', ', $typed_tags);