--- ./token_node.inc.orig	2009-07-15 18:23:08.000000000 +0200
+++ ./token_node.inc	2009-08-12 13:40:44.000000000 +0200
@@ -37,7 +37,7 @@
       $values['author-mail-raw']    = $account->mail;
 
       if (module_exists('comment')) {
-        $values['node_comment_count'] = $node->comment_count;
+        $values['node_comment_count'] = isset($node->comment_count) ? $node->comment_count : 0;
         $values['unread_comment_count'] = comment_num_new($node->nid);
       }
       else {