--- ./token_comment.inc.orig	2010-07-08 02:41:19.000000000 +0200
+++ ./token_comment.inc	2010-08-16 00:13:16.550646416 +0200
@@ -24,6 +24,10 @@
       // Cast to an object just in case fussy Drupal gave us an array
       $comment = (object)$object;
 
+      if (!isset($comment->cid)) {
+        return array();
+      }
+
       $values['comment-cid']             = $comment->cid;
       $values['comment-nid']             = $comment->nid;
       $values['comment-title']           = check_plain($comment->subject);