From 97120bd1f18e5f03848c52c3d8dd24843c8a8adc Mon Sep 17 00:00:00 2001
From: Ben Brosnahan <benbrosy@gmail.com>
Date: Mon, 26 Dec 2016 01:17:45 +0000
Subject: [PATCH 1/2] Add error handling to newsfeed

---
 modules/default/newsfeed/fetcher.js | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/modules/default/newsfeed/fetcher.js b/modules/default/newsfeed/fetcher.js
index ff0a9980..e7c3c388 100644
--- a/modules/default/newsfeed/fetcher.js
+++ b/modules/default/newsfeed/fetcher.js
@@ -80,7 +80,12 @@ var Fetcher = function(url, reloadInterval, encoding) {
 		});
 
 		var headers = {'User-Agent':'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_3) AppleWebKit/537.75.14 (KHTML, like Gecko) Version/7.0.3 Safari/7046A194A'};
-		request({uri: url, encoding: null, headers: headers}).pipe(iconv.decodeStream(encoding)).pipe(parser);
+		request({uri: url, encoding: null, headers: headers})
+			.on('error', function(error) {
+				fetchFailedCallback(self, error);
+				scheduleTimer();
+			})
+			.pipe(iconv.decodeStream(encoding)).pipe(parser);
 
 	};
 

From cebed0824f69cb398695a49e94abb3fb5787d9f0 Mon Sep 17 00:00:00 2001
From: Ben Brosnahan <benbrosy@gmail.com>
Date: Mon, 26 Dec 2016 11:35:37 +0000
Subject: [PATCH 2/2] Fix lint error

---
 js/class.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/js/class.js b/js/class.js
index b1793f16..87e847fd 100644
--- a/js/class.js
+++ b/js/class.js
@@ -41,8 +41,8 @@
 
 		return ret;
 	};
-        })(name, prop[name]) :
-        prop[name];
+})(name, prop[name]) :
+prop[name];
 		}
 
 		// The dummy class constructor