diff --git a/frontend/app/map/lines/lines.js b/frontend/app/map/lines/lines.js
index 56392d9b..e39e90f6 100644
--- a/frontend/app/map/lines/lines.js
+++ b/frontend/app/map/lines/lines.js
@@ -163,9 +163,11 @@ fm.app.factory("fmMapLines", function(fmUtils, $uibModal, $compile, $timeout, $r
 
 				scope.$watch("line.trackPoints", (trackPoints) => {
 					let latlngs = [];
-					for(let i=0; i<line.trackPoints.length; i++) {
-						if(line.trackPoints[i] && line.trackPoints[i].ele != null)
-							latlngs.push(Object.assign(new L.latLng(line.trackPoints[i].lat, line.trackPoints[i].lon), { meta: { ele: line.trackPoints[i].ele } }));
+					if(line.trackPoints) {
+						for(let i=0; i<line.trackPoints.length; i++) {
+							if(line.trackPoints[i] && line.trackPoints[i].ele != null)
+								latlngs.push(Object.assign(new L.latLng(line.trackPoints[i].lat, line.trackPoints[i].lon), { meta: { ele: line.trackPoints[i].ele } }));
+						}
 					}
 
 					elevationPlot.addData({
diff --git a/frontend/app/map/markers/markers.js b/frontend/app/map/markers/markers.js
index 0c07729a..2b1e7988 100644
--- a/frontend/app/map/markers/markers.js
+++ b/frontend/app/map/markers/markers.js
@@ -51,8 +51,10 @@ fm.app.factory("fmMapMarkers", function($uibModal, fmUtils, $compile, $timeout,
 				if(!markersById[marker.id])
 					return;
 
-				if(openMarker && openMarker.id == marker.id)
+				if(openMarker && openMarker.id == marker.id) {
 					openMarker.hide();
+					openMarker = null;
+				}
 
 				markersById[marker.id].removeFrom(map.map);
 				delete markersById[marker.id];
diff --git a/frontend/app/map/messages/messages.js b/frontend/app/map/messages/messages.js
index a62b9698..e1c6e15c 100644
--- a/frontend/app/map/messages/messages.js
+++ b/frontend/app/map/messages/messages.js
@@ -13,6 +13,9 @@ fm.app.factory("fmMapMessages", function($rootScope, $compile, $timeout) {
 
 		return {
 			showMessage : function(type, message, buttons, lifetime, onclose) {
+				if(message instanceof Error)
+					console.warn(message.stack);
+
 				var messageObj = {
 					type: type,
 					message: message instanceof Error ? message.name + ": " + message.message : message,