--- a/src/protocols/yahoo/yahoo.c Thu Aug 10 23:58:24 2006 +0000 +++ b/src/protocols/yahoo/yahoo.c Fri Aug 11 00:21:26 2006 +0000 @@ -350,7 +350,7 @@ break; yahoo_friend_set_buddy_icon_need_request(f, FALSE); - if (cksum != gaim_blist_node_get_int((GaimBlistNode*)b, YAHOO_ICON_CHECKSUM_KEY)) + if (b && cksum != gaim_blist_node_get_int((GaimBlistNode*)b, YAHOO_ICON_CHECKSUM_KEY)) yahoo_send_picture_request(gc, name); break; @@ -3396,7 +3396,7 @@ if (foo) group = foo->name; if (!group) { - g = gaim_buddy_get_group(gaim_find_buddy(gc->account, buddy->name)); + g = gaim_buddy_get_group(buddy); if (g) group = g->name; else