--- a/mcabber/src/roster.c	Sun Aug 26 22:23:30 2007 +0200
+++ b/mcabber/src/roster.c	Tue Aug 28 10:11:39 2007 +0200
@@ -867,6 +867,8 @@
 
 const char *buddy_getjid(gpointer rosterdata)
 {
+  if (!rosterdata)
+    return NULL;
   roster *roster_usr = rosterdata;
   return roster_usr->jid;
 }
@@ -1270,7 +1272,7 @@
 // Look for a buddy with specified jid.
 // Search begins at buddylist; if no match is found in the the buddylist,
 // return NULL;
-GList *buddy_search_jid(char *jid)
+GList *buddy_search_jid(const char *jid)
 {
   GList *buddy;
   roster *roster_usr;