X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-ui-actions.c;h=8646f0127bcb82f9c3fa5a75cd07204ae5d366e6;hp=58ae3fbdb4b003e8cc8660aa4ff236200c309e88;hb=54f4d0a7ed835ba70ffeae20c5ced91ca3295b35;hpb=5a2aab3454fcd5e798e10f8e02357ceacd466ff9

diff --git a/src/modest-ui-actions.c b/src/modest-ui-actions.c
index 58ae3fb..8646f01 100644
--- a/src/modest-ui-actions.c
+++ b/src/modest-ui-actions.c
@@ -6561,6 +6561,9 @@ modest_ui_actions_get_msg_already_deleted_error_msg (ModestWindow *win)
 		folder = TNY_FOLDER_STORE (tny_header_get_folder (header));
 	}
 
+	if (!header || !folder)
+		goto frees;
+
 	/* Get the account type */
 	account = tny_folder_get_account (TNY_FOLDER (folder));
 	proto = modest_tny_account_get_protocol_type (account);
@@ -6575,10 +6578,14 @@ modest_ui_actions_get_msg_already_deleted_error_msg (ModestWindow *win)
 		msg = g_strdup_printf (_("mail_ni_ui_folder_get_msg_folder_error"));
 	}
 
+ frees:
 	/* Frees */
-	g_object_unref (account);
-	g_object_unref (folder);
-	g_object_unref (header);
+	if (account)
+		g_object_unref (account);
+	if (folder)
+		g_object_unref (folder);
+	if (header)
+		g_object_unref (header);
 
 	return msg;
 }