diff --git a/html/script.js b/html/script.js
index f91e822..1a0926b 100644
--- a/html/script.js
+++ b/html/script.js
@@ -344,6 +344,7 @@ function fetchData() {
 	FetchPending.fail(function(jqxhr, status, error) {
 		$("#update_error_detail").text("AJAX call failed (" + status + (error ? (": " + error) : "") + "). Maybe dump1090 is no longer running?");
 		$("#update_error").css('display','block');
+		StaleReceiverCount++;
 		fetchData();
 	});
 }
@@ -1936,6 +1937,7 @@ function resetMap() {
 	OLMap.getView().setRotation(mapOrientation);
 
 	selectPlaneByHex(null,false);
+	$("#update_error").css('display','none');
 }
 
 function updateMapSize() {
diff --git a/tar1090.sh b/tar1090.sh
index 476ad3f..54a195c 100755
--- a/tar1090.sh
+++ b/tar1090.sh
@@ -2,6 +2,9 @@
 
 trap "kill 0" SIGINT
 trap "kill -2 0" SIGTERM
+
+set -e
+
 INTERVAL=10
 HISTORY_SIZE=360
 CS=60