Index: modules/hs_taxonomy.module
===================================================================
--- modules/hs_taxonomy.module	(revision 563)
+++ modules/hs_taxonomy.module	(working copy)
@@ -147,7 +147,7 @@ function hs_taxonomy_form_taxonomy_form_
     '#type'   => 'hierarchical_select',
     '#config' => $config,
     // Copied from core.
-    '#title'         => t('Parents'), 
+    '#title'         => t('Parents'),
     '#description'   => t('Parent terms') .'.',
     '#weight'        => -15,
     '#default_value' => $parent,
@@ -160,7 +160,7 @@ function hs_taxonomy_form_taxonomy_form_
     '#type'   => 'hierarchical_select',
     '#config' => $config,
     // Copied from core.
-    '#title'         => t('Related terms'), 
+    '#title'         => t('Related terms'),
     '#weight'        => -15,
     '#default_value' => $related,
   );
@@ -211,7 +211,7 @@ function hs_taxonomy_form($vid, $value =
         'vid'         => $vid,
         'exclude_tid' => NULL,
         'root_term'   => NULL,
-      ),      
+      ),
     ),
     '#title'         => $title,
     '#default_value' => $value,
@@ -536,6 +536,7 @@ function hs_taxonomy_token_values($type,
       // when a token is requested for a vocabulary that's not associated with
       // the current content type.
       if (!isset($all_vids)) {
+        $all_vids = array();
         $result = db_query("SELECT vid FROM {vocabulary}");
         while ($row = db_fetch_object($result)) {
           $all_vids[] = $row->vid;
@@ -629,7 +630,7 @@ function _hs_taxonomy_token_termpath_for
     foreach ($lineage as $item) {
       $terms[] = $item['label'];
     }
-  }  
+  }
 
   return $terms;
 }