2 files changed, 12 insertions, 2 deletions
diff --git a/addressbook/gui/component/addressbook-component.c b/addressbook/gui/component/addressbook-component.c
index af65240d83..3f20c5f6d8 100644
--- a/addressbook/gui/component/addressbook-component.c
+++ b/addressbook/gui/component/addressbook-component.c
@@ -118,7 +118,12 @@ ensure_sources (AddressbookComponent *component)
 		GSList *s;
 		for (s = sources; s; s = s->next) {
 			ESource *source = E_SOURCE (s->data);
-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+			const gchar *relative_uri;
+
+			relative_uri = e_source_peek_relative_uri (source);
+			if (relative_uri == NULL)
+				continue;
+			if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
 				personal_source = source;
 				break;
 			}
diff --git a/addressbook/gui/component/addressbook-migrate.c b/addressbook/gui/component/addressbook-migrate.c
index 70518239ed..18a58a032a 100644
--- a/addressbook/gui/component/addressbook-migrate.c
+++ b/addressbook/gui/component/addressbook-migrate.c
@@ -472,7 +472,12 @@ create_groups (MigrationContext *context,
 		GSList *s;
 		for (s = sources; s; s = s->next) {
 			ESource *source = E_SOURCE (s->data);
-			if (!strcmp (PERSONAL_RELATIVE_URI, e_source_peek_relative_uri (source))) {
+			const gchar *relative_uri;
+
+			relative_uri = e_source_peek_relative_uri (source);
+			if (relative_uri == NULL)
+				continue;
+			if (!strcmp (PERSONAL_RELATIVE_URI, relative_uri)) {
 				*personal_source = g_object_ref (source);
 				break;
 			}