From e986bbe93fab2d002797bf40983d91ceb76a133c Mon Sep 17 00:00:00 2001
From: Jean-Philippe Orsini <jeanfi@gmail.com>
Date: Thu, 2 May 2013 11:16:49 +0000
Subject: [PATCH]

---
 src/main.c     | 3 ++-
 src/ttrss_ws.c | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main.c b/src/main.c
index e122bfa..1518bd6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -141,7 +141,8 @@ void update()
 		cur++;
 	}
 
-	ttrs_download_headline_content(feeds);
+	if (feeds)
+		ttrs_download_headline_content(feeds);
 
 	model_state = 0;
 
diff --git a/src/ttrss_ws.c b/src/ttrss_ws.c
index 1d52696..ac6ee06 100644
--- a/src/ttrss_ws.c
+++ b/src/ttrss_ws.c
@@ -134,8 +134,10 @@ execute(struct http_session *sess, struct json_object *rq, char **err)
 
 			if (str) {
 				log_debug("execute() err=%s", str);
-				*err = strdup(str);
 				content = NULL;
+				
+				if (err)
+					*err = strdup(str);
 			} else {
 				json_object_get(content);
 			}
-- 
2.7.4