2 files changed, 18 insertions, 6 deletions

diff --git a/camel/providers/nntp/camel-nntp-folder.c b/camel/providers/nntp/camel-nntp-folder.c
index 87d401caca..091d35e591 100644
--- a/camel/providers/nntp/camel-nntp-folder.c
+++ b/camel/providers/nntp/camel-nntp-folder.c
@@ -131,7 +131,9 @@ nntp_folder_sync (CamelFolder *folder, gboolean expunge,
 	camel_folder_summary_save (CAMEL_NNTP_FOLDER(folder)->summary);
 
 	store = CAMEL_NNTP_STORE (camel_folder_get_parent_store (folder));
-	camel_nntp_newsrc_write (store->newsrc);
+
+	if (store->newsrc)
+		camel_nntp_newsrc_write (store->newsrc);
 }
 
 static CamelFolder*
@@ -309,12 +311,14 @@ nntp_folder_get_subfolder_names (CamelFolder *folder)
 {
 	if (!strcmp (folder->name, "/")) {
 		CamelStore *store = camel_folder_get_parent_store (folder);
-		GPtrArray *array = camel_nntp_newsrc_get_subscribed_group_names (CAMEL_NNTP_STORE (store)->newsrc);
-		return array;
-	}
-	else {
-		return NULL;
+		
+		if (CAMEL_NNTP_STORE (store)->newsrc) {
+			GPtrArray *array = camel_nntp_newsrc_get_subscribed_group_names (CAMEL_NNTP_STORE (store)->newsrc);
+			return array;
+		}
 	}
+	
+	return NULL;
 }
 
 static void
diff --git a/camel/providers/nntp/camel-nntp-newsrc.c b/camel/providers/nntp/camel-nntp-newsrc.c
index fc0f4c2a1a..81594d3dcd 100644
--- a/camel/providers/nntp/camel-nntp-newsrc.c
+++ b/camel/providers/nntp/camel-nntp-newsrc.c
@@ -229,6 +229,8 @@ camel_nntp_newsrc_get_subscribed_group_names (CamelNNTPNewsrc *newsrc)
 {
 	struct newsrc_ptr_array npa;
 
+	g_return_val_if_fail (newsrc, NULL);
+
 	npa.ptr_array = g_ptr_array_new();
 	npa.subscribed_only = TRUE;
 
@@ -243,6 +245,8 @@ camel_nntp_newsrc_get_all_group_names (CamelNNTPNewsrc *newsrc)
 {
 	struct newsrc_ptr_array npa;
 
+	g_return_val_if_fail (newsrc, NULL);
+
 	npa.ptr_array = g_ptr_array_new();
 	npa.subscribed_only = FALSE;
 
@@ -338,6 +342,8 @@ camel_nntp_newsrc_write_to_file(CamelNNTPNewsrc *newsrc, FILE *fp)
 {
 	struct newsrc_fp newsrc_fp;
 
+	g_return_if_fail (newsrc);
+
 	newsrc_fp.newsrc = newsrc;
 	newsrc_fp.fp = fp;
 
@@ -351,6 +357,8 @@ camel_nntp_newsrc_write(CamelNNTPNewsrc *newsrc)
 {
 	FILE *fp;
 
+	g_return_if_fail (newsrc);
+
 	if (!newsrc->dirty)
 		return;