diff --git a/modules/default/calendar/calendar.js b/modules/default/calendar/calendar.js
index 726d659b..1b356ac4 100755
--- a/modules/default/calendar/calendar.js
+++ b/modules/default/calendar/calendar.js
@@ -146,12 +146,9 @@ Module.register("calendar", {
 					this.broadcastEvents();
 				}
 			}
-		} else if (notification === "FETCH_ERROR") {
+		} else if (notification === "CALENDAR_ERROR") {
 			this.error = this.translate("MODULE_CONFIG_ERROR", { MODULE_NAME: this.name, ERROR: payload.error });
 			this.loaded = true;
-		} else if (notification === "INCORRECT_URL") {
-			this.error = `Incorrect url: ${payload.url}`;
-			this.loaded = true;
 		}
 
 		this.updateDom(this.config.animationSpeed);
diff --git a/modules/default/calendar/calendarfetcher.js b/modules/default/calendar/calendarfetcher.js
index 02778fd5..805e080b 100644
--- a/modules/default/calendar/calendarfetcher.js
+++ b/modules/default/calendar/calendarfetcher.js
@@ -78,7 +78,7 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
 						maximumNumberOfDays
 					});
 				} catch (error) {
-					fetchFailedCallback(this, error.message);
+					fetchFailedCallback(this, error);
 					scheduleTimer();
 					return;
 				}
@@ -86,7 +86,7 @@ const CalendarFetcher = function (url, reloadInterval, excludedEvents, maximumEn
 				scheduleTimer();
 			})
 			.catch((error) => {
-				fetchFailedCallback(this, error.message);
+				fetchFailedCallback(this, error);
 				scheduleTimer();
 			});
 	};
diff --git a/modules/default/calendar/node_helper.js b/modules/default/calendar/node_helper.js
index a280ddff..c74b165e 100644
--- a/modules/default/calendar/node_helper.js
+++ b/modules/default/calendar/node_helper.js
@@ -40,7 +40,8 @@ module.exports = NodeHelper.create({
 		try {
 			new URL(url);
 		} catch (error) {
-			this.sendSocketNotification("INCORRECT_URL", { id: identifier, url: url });
+			Log.error("Calendar Error. Malformed calendar url: ", url, error);
+			this.sendSocketNotification("CALENDAR_ERROR", { error_type: "MODULE_ERROR_MALFORMED_URL" });
 			return;
 		}
 
@@ -55,10 +56,9 @@ module.exports = NodeHelper.create({
 
 			fetcher.onError((fetcher, error) => {
 				Log.error("Calendar Error. Could not fetch calendar: ", fetcher.url(), error);
-				this.sendSocketNotification("FETCH_ERROR", {
-					id: identifier,
-					url: fetcher.url(),
-					error: error
+				let error_type = NodeHelper.checkFetchError(error);
+				this.sendSocketNotification("CALENDAR_ERROR", {
+					error_type
 				});
 			});