1 files changed, 5 insertions, 2 deletions
diff --git a/addressbook/gui/component/select-names/e-select-names-table-model.c b/addressbook/gui/component/select-names/e-select-names-table-model.c
index fee84ce071..84c7754020 100644
--- a/addressbook/gui/component/select-names/e-select-names-table-model.c
+++ b/addressbook/gui/component/select-names/e-select-names-table-model.c
@@ -129,8 +129,11 @@ fill_in_info (ESelectNamesTableModel *model)
 					model->data[i].email = g_strdup("");
 				gtk_object_unref(GTK_OBJECT(simple));
 			} else {
-				model->data[i].name =  g_strdup (e_destination_get_name (dest));
-				model->data[i].email = g_strdup (e_destination_get_email (dest));
+				const gchar *name = e_destination_get_name (dest);
+				const gchar *email = e_destination_get_email (dest);
+
+				model->data[i].name =  g_strdup (name && *name ? name : email);
+				model->data[i].email = g_strdup (email);
 			}
 		}
 	} else {