diff --git a/src/calls-ui-call-data.c b/src/calls-ui-call-data.c
index 70f39b9..cc6a2a4 100644
--- a/src/calls-ui-call-data.c
+++ b/src/calls-ui-call-data.c
@@ -144,7 +144,10 @@ calls_ui_call_data_get_avatar_icon (CuiCall *call_data)
 
   g_return_val_if_fail (CALLS_UI_CALL_DATA (self), NULL);
 
-  return calls_best_match_get_avatar (self->best_match);
+  if (self->best_match)
+    return calls_best_match_get_avatar (self->best_match);
+  else
+    return NULL;
 }
 
 
@@ -332,6 +335,9 @@ set_call_data (CallsUiCallData *self,
     calls_contacts_provider_lookup_id (contacts_provider,
                                        calls_call_get_id (call));
 
+  if (!self->best_match)
+    return;
+
   g_signal_connect_object (self->best_match,
                            "notify::name",
                            G_CALLBACK (on_notify_name),