Index: menutrails.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/menutrails/menutrails.module,v
retrieving revision 1.4.2.10
diff -u -p -r1.4.2.10 menutrails.module
--- menutrails.module	4 Dec 2008 02:12:28 -0000	1.4.2.10
+++ menutrails.module	27 Jan 2009 03:55:05 -0000
@@ -340,11 +340,12 @@ function menutrails_token_values($type, 
     if (!empty($mlid) || !empty($node->menu['mlid']) || !empty($node->menu['plid'])) {
       $menu_link = menu_link_load($mlid);
       $trail_raw = _menu_titles($menu_link, $node->nid);
+    }
+    if (is_array($trail_raw) && $trail_raw) {
       // Remove the node itself.
       array_pop($trail_raw);
-    }
-    $trail = array();
-    if (is_array($trail_raw)) {
+
+      $trail = array();
       foreach ($trail_raw as $title) {
         $trail[] = check_plain($title);
       }
@@ -352,10 +353,8 @@ function menutrails_token_values($type, 
       $tokens['menu-trail-parents'] = implode('/', $trail);
     }
     // Return NULL in case there is no trail.
-    if (!isset($tokens['menu-trail-parents-raw'])) {
+    else {
       $tokens['menu-trail-parents-raw'] = NULL;
-    }
-    if (!isset($tokens['menu-trail-parents'])) {
       $tokens['menu-trail-parents'] = NULL;
     }
     return $tokens;