Undefined index: bundle in entity_extract_ids() after upgrade to Drupal 7.8

Undefined index: bundle in entity_extract_ids() (line 7379 of /var/www/html/includes/common.inc)

After the way D7.8 handled errors for this type of problem changed, many modules are having to fix this issue.

I have a backtrace if this helps. I am using comment notify, views, media, calendar, and signup. I can verify that this is for nodes where anyone commenting other than the original commenter will get the error. I'm not sure if this is in comment notify or tokens or somewhere else, but here goes (sorry, but the code tags don't work for format the code below):

[2] => Array
(
[function] => _drupal_exception_handler
[args] => Array
(
[0] => EntityMalformedException Object
(
[message:protected] => Missing bundle property on entity of type comment.
[string:Exception:private] =>
[code:protected] => 0
[file:protected] => C:\wamp\www\drupal2\includes\common.inc
[line:protected] => 7405
[trace:Exception:private] => Array
(
[0] => Array
(
[file] => C:\wamp\www\drupal2\sites\all\modules\token\token.tokens.inc
[line] => 1347
[function] => entity_extract_ids
[args] => Array
(
[0] => comment
[1] => stdClass Object
(
[cid] => 5
[nid] => 100
[uid] => 1
[name] => admin
[thread] => 01/
[notify] => 1
[notify_hash] => xDuM_G96sZqY5oC8IlyogA0BmYcbJU8
[cmail] =>
[uinit] => you@yourdomain.com
[umail] => admin@mysite.org
)

)

)

[1] => Array
(
[function] => field_tokens
[args] => Array
(
[0] => entity
[1] => Array
(
[author] => [comment-subscribed:author]
[unsubscribe-url] => [comment-subscribed:unsubscribe-url]
)

[2] => Array
(
[entity_type] => comment
[entity] => stdClass Object
(
[cid] => 5
[nid] => 100
[uid] => 1
[name] => admin
[thread] => 01/
[notify] => 1
[notify_hash] => xDuM_G6se_ImY5oC8ogA0B4OmYcbJU8
[cmail] =>
[uinit] => you@yourdomain.com
[umail] => admin@mydomain.org
)

[token_type] => comment
)

[3] => Array
(
[sanitize] =>
)

)

)

[2] => Array
(
[file] => C:\wamp\www\drupal2\includes\module.inc
[line] => 818
[function] => call_user_func_array
[args] => Array
(
[0] => field_tokens
[1] => Array
(
[1] => entity
[2] => Array
(
[author] => [comment-subscribed:author]
[unsubscribe-url] => [comment-subscribed:unsubscribe-url]
)

[3] => Array
(
[entity_type] => comment
[entity] => stdClass Object
(
[cid] => 5
[nid] => 100
[uid] => 1
[name] => admin
[thread] => 01/
[notify] => 1
[notify_hash] => xDuM_G96se_kGZqY5oC8IlyogA04nmYcbJU8
[cmail] =>
[uinit] => you@yourdomain.com
[umail] => admin@mydomain.org
)

[token_type] => comment
)

[4] => Array
(
[sanitize] =>
)

)

)

)

[3] => Array
(
[file] => C:\wamp\www\drupal2\includes\token.inc
[line] => 173
[function] => module_invoke_all
[args] => Array
(
[0] => tokens
[1] => entity
[2] => Array
(
[author] => [comment-subscribed:author]
[unsubscribe-url] => [comment-subscribed:unsubscribe-url]
)

[3] => Array
(
[entity_type] => comment
[entity] => stdClass Object
(
[cid] => 5
[nid] => 100
[uid] => 1
[name] => admin
[thread] => 01/
[notify] => 1
[notify_hash] => xDuM96se_ImkGZqY5oC8IlyB4O4nmYcbJU8
[cmail] =>
[uinit] => you@yourdomain.com
[umail] => admin@mydoman.org
)

[token_type] => comment
)

[4] => Array
(
[sanitize] =>
)

)

)

[4] => Array
(
[file] => C:\wamp\www\drupal2\sites\all\modules\token\token.tokens.inc
[line] => 747
[function] => token_generate
[args] => Array
(
[0] => entity
[1] => Array
(
[author] => [comment-subscribed:author]
[unsubscribe-url] => [comment-subscribed:unsubscribe-url]
)

[2] => Array
(
[entity_type] => comment
[entity] => stdClass Object
(
[cid] => 5
[nid] => 100
[uid] => 1
[name] => admin
[thread] => 01/
[notify] => 1
[notify_hash] => xDuM_96se_ImkGZqY5oC8IlyogA4nmYcbJU8
[cmail] =>
[uinit] => you@yourdomain.com
[umail] => admin@mckenziehoa.org
)

[token_type] => comment
)

[3] => Array
(
[sanitize] =>
)

)

)