--- a/libpurple/protocols/jabber/message.c Sun Mar 21 20:57:29 2010 +0000 +++ b/libpurple/protocols/jabber/message.c Mon Mar 22 21:45:23 2010 +0000 @@ -474,7 +474,10 @@ if (!data && cid != NULL) { /* we haven't cached this already, let's add it */ JabberData *new_data = jabber_data_create_from_xml(data_tag); - jabber_data_associate_remote(new_data); + + if (new_data) { + jabber_data_associate_remote(new_data); + } } } }