[evolution-data-server/gnome-3-6] Bug #687776 - E-D-S crash in local address book

[Milan Crha <mcrha src gnome org>]

commit 7668bc28f0427901e0e7b75d8bf0d740ce389606
Author: Milan Crha <mcrha redhat com>
Date:   Tue Nov 6 19:00:43 2012 +0100

    Bug #687776 - E-D-S crash in local address book

 addressbook/backends/file/e-book-backend-file.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)
---
diff --git a/addressbook/backends/file/e-book-backend-file.c b/addressbook/backends/file/e-book-backend-file.c
index f27df35..16d269b 100644
--- a/addressbook/backends/file/e-book-backend-file.c
+++ b/addressbook/backends/file/e-book-backend-file.c
@@ -737,11 +737,11 @@ build_sqlitedb (EBookBackendFilePrivate *bfpriv)
 		return FALSE;
 	}
 
-	if (!e_book_backend_sqlitedb_add_contacts (bfpriv->sqlitedb,
+	if (contacts && !e_book_backend_sqlitedb_add_contacts (bfpriv->sqlitedb,
 						   SQLITEDB_FOLDER_ID,
 						   contacts, FALSE, &error)) {
-		g_warning ("Failed to build contact summary: %s", error->message);
-		g_error_free (error);
+		g_warning ("Failed to build contact summary: %s", error ? error->message : "Unknown error");
+		g_clear_error (&error);
 		e_util_free_object_slist (contacts);
 		return FALSE;
 	}