X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmodest-account-mgr.c;h=bbbb2e8c6d559e6b3615bd232cd6de85ddfaa9fa;hb=0fb332b6dc8b4e67b7f13ab60563a4205b2be743;hp=d37c498237016ad8eb559a5a3f2225ac55a89311;hpb=3b5cac93a4d81e187edca49db15816a800cd5e82;p=modest

diff --git a/src/modest-account-mgr.c b/src/modest-account-mgr.c
index d37c498..bbbb2e8 100644
--- a/src/modest-account-mgr.c
+++ b/src/modest-account-mgr.c
@@ -472,7 +472,7 @@ modest_account_mgr_add_server_account (ModestAccountMgr * self,
 	
 	/* Add the security settings: */
 	modest_account_mgr_set_server_account_security (self, name, security);
-	
+
 cleanup:
 	if (!ok) {
 		g_printerr ("modest: failed to add server account\n");
@@ -1167,8 +1167,9 @@ _modest_account_mgr_get_account_keyname (const gchar *account_name, const gchar*
 		retval = g_strconcat (namespace, "/", escaped_account_name, NULL);
 
 	/* Sanity check: */
-	if (!modest_conf_key_is_valid (retval)) {
-		g_warning ("%s: Generated conf key was invalid: %s", __FUNCTION__, retval);
+	if (!retval || !modest_conf_key_is_valid (retval)) {
+		g_warning ("%s: Generated conf key was invalid: %s", __FUNCTION__,
+			   retval ? retval: "<empty>");
 		g_free (retval);
 		retval = NULL;
 	}