X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-account-protocol.c;h=a995db2428b540f87a00dbb5459614bcefc7a232;hp=afeaabad4642fd7b307a1ddf56c6fcf0f78789fb;hb=12a672c559d983c4e49a7e4054ee14c0177ecb1c;hpb=c3b0f06479bf273c47cb33fed18a07dafc25c54b

diff --git a/src/modest-account-protocol.c b/src/modest-account-protocol.c
index afeaaba..a995db2 100644
--- a/src/modest-account-protocol.c
+++ b/src/modest-account-protocol.c
@@ -555,12 +555,16 @@ modest_account_protocol_get_account_settings_dialog (ModestAccountProtocol *self
 	if (dialog == NULL) {
 
 		dialog = MODEST_ACCOUNT_PROTOCOL_GET_CLASS (self)->create_account_settings_dialog (self);
-	
+
+		/* Check existence of dialog */
+		if (dialog == NULL)
+			return NULL;
+
 		/* Load settings */
-		settings = modest_account_mgr_load_account_settings (modest_runtime_get_account_mgr (), 
+		settings = modest_account_mgr_load_account_settings (modest_runtime_get_account_mgr (),
 								     account_name);
 		modest_account_settings_dialog_load_settings (dialog, settings);
-	
+
 		/* Close dialog on response */
 		g_signal_connect_swapped (dialog,
 					  "response",