diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js
index e7a6fcc9..726d659b 100755
--- a/modules/default/calendar/calendar.js
+++ b/modules/default/calendar/calendar.js
@@ -147,10 +147,11 @@ Module.register("calendar", {
 				}
 			}
 		} else if (notification === "FETCH_ERROR") {
-			Log.error("Calendar Error. Could not fetch calendar: " + payload.url);
+			this.error = this.translate("MODULE_CONFIG_ERROR", { MODULE_NAME: this.name, ERROR: payload.error });
 			this.loaded = true;
 		} else if (notification === "INCORRECT_URL") {
-			Log.error("Calendar Error. Incorrect url: " + payload.url);
+			this.error = `Incorrect url: ${payload.url}`;
+			this.loaded = true;
 		}
 
 		this.updateDom(this.config.animationSpeed);
@@ -168,6 +169,12 @@ Module.register("calendar", {
 		const wrapper = document.createElement("table");
 		wrapper.className = this.config.tableClass;
 
+		if (this.error) {
+			wrapper.innerHTML = this.error;
+			wrapper.className = this.config.tableClass + " dimmed";
+			return wrapper;
+		}
+
 		if (events.length === 0) {
 			wrapper.innerHTML = this.loaded ? this.translate("EMPTY") : this.translate("LOADING");
 			wrapper.className = this.config.tableClass + " dimmed";
diff --git a/modules/default/newsfeed/newsfeed.js b/modules/default/newsfeed/newsfeed.js
index 441984f4..13efd590 100644
--- a/modules/default/newsfeed/newsfeed.js
+++ b/modules/default/newsfeed/newsfeed.js
@@ -89,6 +89,9 @@ Module.register("newsfeed", {
 
 			this.loaded = true;
 			this.error = null;
+		} else if (notification === "FETCH_ERROR") {
+			this.error = `Could not fetch newsfeed ${payload.url}`;
+			this.scheduleUpdateInterval();
 		} else if (notification === "INCORRECT_URL") {
 			this.error = `Incorrect url: ${payload.url}`;
 			this.scheduleUpdateInterval();
diff --git a/modules/default/newsfeed/node_helper.js b/modules/default/newsfeed/node_helper.js
index 6fd461a1..29e503d8 100644
--- a/modules/default/newsfeed/node_helper.js
+++ b/modules/default/newsfeed/node_helper.js
@@ -52,6 +52,7 @@ module.exports = NodeHelper.create({
 			});
 
 			fetcher.onError((fetcher, error) => {
+				Log.error("Newsfeed Error. Could not fetch newsfeed: ", fetcher.url(), error);
 				this.sendSocketNotification("FETCH_ERROR", {
 					url: fetcher.url(),
 					error: error