aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--libempathy-gtk/empathy-contact-chooser.c2
-rw-r--r--libempathy-gtk/empathy-individual-store-channel.c2
2 files changed, 4 insertions, 0 deletions
diff --git a/libempathy-gtk/empathy-contact-chooser.c b/libempathy-gtk/empathy-contact-chooser.c
index cba419bea..97ce7d9d7 100644
--- a/libempathy-gtk/empathy-contact-chooser.c
+++ b/libempathy-gtk/empathy-contact-chooser.c
@@ -221,6 +221,8 @@ get_contacts_cb (TpConnection *connection,
return;
individual = empathy_create_individual_from_tp_contact (contacts[0]);
+ if (individual == NULL)
+ return;
/* listen for updates to the capabilities */
tp_g_signal_connect_object (contacts[0], "notify::capabilities",
diff --git a/libempathy-gtk/empathy-individual-store-channel.c b/libempathy-gtk/empathy-individual-store-channel.c
index 75284602b..76ff74e25 100644
--- a/libempathy-gtk/empathy-individual-store-channel.c
+++ b/libempathy-gtk/empathy-individual-store-channel.c
@@ -82,6 +82,8 @@ add_members (EmpathyIndividualStoreChannel *self,
continue;
individual = empathy_create_individual_from_tp_contact (contact);
+ if (individual == NULL)
+ return;
DEBUG ("%s joined channel %s", tp_contact_get_identifier (contact),
tp_proxy_get_object_path (self->priv->channel));