diff --git a/core/cleanup.py b/core/cleanup.py
index 800b582..4238fd7 100644
--- a/core/cleanup.py
+++ b/core/cleanup.py
@@ -44,7 +44,7 @@ class CleanupTimer:
             for i in list(DATA_STORE.spots.keys()):
                 try:
                     spot = DATA_STORE.spots.get(i)
-                    if spot.expired():
+                    if spot and spot.expired():
                         DATA_STORE.spots.delete(i)
                 except KeyError:
                     # Must have already been deleted, OK with that
@@ -52,7 +52,7 @@ class CleanupTimer:
             for i in list(DATA_STORE.alerts.keys()):
                 try:
                     alert = DATA_STORE.alerts.get(i)
-                    if alert.expired():
+                    if alert and alert.expired():
                         DATA_STORE.alerts.delete(i)
                 except KeyError:
                     # Must have already been deleted, OK with that
diff --git a/templates/add_spot.html b/templates/add_spot.html
index 2b5ef36..8f13ea9 100644
--- a/templates/add_spot.html
+++ b/templates/add_spot.html
@@ -76,7 +76,7 @@
 
 </div>
 
-<script src="/static/js/add-spot.js?v=1786747642"></script>
+<script src="/static/js/add-spot.js?v=1786774296"></script>
 <script>$(document).ready(function () {
     $("#nav-link-add-spot").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/alerts.html b/templates/alerts.html
index 31b429c..f8d6d79 100644
--- a/templates/alerts.html
+++ b/templates/alerts.html
@@ -82,7 +82,7 @@
 
 </div>
 
-<script src="/static/js/alerts.js?v=1786747642"></script>
+<script src="/static/js/alerts.js?v=1786774296"></script>
 <script>$(document).ready(function () {
     $("#nav-link-alerts").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/bands.html b/templates/bands.html
index c2cbb90..066ad03 100644
--- a/templates/bands.html
+++ b/templates/bands.html
@@ -79,8 +79,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1786747642"></script>
-<script src="/static/js/bands.js?v=1786747642"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1786774296"></script>
+<script src="/static/js/bands.js?v=1786774296"></script>
 <script>$(document).ready(function () {
     $("#nav-link-bands").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/base.html b/templates/base.html
index 45320bf..a60793c 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -1,6 +1,6 @@
 {% extends "skeleton.html" %}
 {% block head_extra %}
-<link rel="stylesheet" href="/static/css/style.css?v=1786747642" type="text/css">
+<link rel="stylesheet" href="/static/css/style.css?v=1786774296" type="text/css">
 <link href="/static/vendor/css/bootstrap-5.3.8.min.css" rel="stylesheet">
 <link href="/static/vendor/css/fontawesome-6.7.2.min.css" rel="stylesheet">
 <link href="/static/vendor/css/solid-6.7.2.min.css" rel="stylesheet">
@@ -15,10 +15,10 @@
   window.fetchEventSource = fetchEventSource;
 </script>
 
-<script src="/static/js/utils.js?v=1786747642"></script>
-<script src="/static/js/ui-ham.js?v=1786747642"></script>
-<script src="/static/js/geo.js?v=1786747642"></script>
-<script src="/static/js/common.js?v=1786747642"></script>
+<script src="/static/js/utils.js?v=1786774296"></script>
+<script src="/static/js/ui-ham.js?v=1786774296"></script>
+<script src="/static/js/geo.js?v=1786774296"></script>
+<script src="/static/js/common.js?v=1786774296"></script>
 {% end %}
 {% block body %}
 <div class="container">
diff --git a/templates/conditions.html b/templates/conditions.html
index 8b8ec4b..83233ae 100644
--- a/templates/conditions.html
+++ b/templates/conditions.html
@@ -284,7 +284,7 @@
 </div>
 
 <script src="/static/vendor/js/chart-4.4.9.umd.min.js"></script>
-<script src="/static/js/conditions.js?v=1786747642"></script>
+<script src="/static/js/conditions.js?v=1786774296"></script>
 <script>$(document).ready(function () {
     $("#nav-link-conditions").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/map.html b/templates/map.html
index b2882b5..b955643 100644
--- a/templates/map.html
+++ b/templates/map.html
@@ -112,8 +112,8 @@
 <script src="/static/vendor/js/leaflet-cqzones.js"></script>
 <script src="/static/vendor/js/leaflet-workedallbritainireland.js" type="module"></script>
 
-<script src="/static/js/spotsbandsandmap.js?v=1786747642"></script>
-<script src="/static/js/map.js?v=1786747642"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1786774296"></script>
+<script src="/static/js/map.js?v=1786774296"></script>
 <script>$(document).ready(function () {
     $("#nav-link-map").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/spots.html b/templates/spots.html
index b9721fb..a5ffd30 100644
--- a/templates/spots.html
+++ b/templates/spots.html
@@ -118,8 +118,8 @@
 
 </div>
 
-<script src="/static/js/spotsbandsandmap.js?v=1786747642"></script>
-<script src="/static/js/spots.js?v=1786747642"></script>
+<script src="/static/js/spotsbandsandmap.js?v=1786774296"></script>
+<script src="/static/js/spots.js?v=1786774296"></script>
 <script>$(document).ready(function () {
     $("#nav-link-spots").addClass("active");
 }); <!-- highlight active page in nav --></script>
diff --git a/templates/status.html b/templates/status.html
index 68e3147..e8750b6 100644
--- a/templates/status.html
+++ b/templates/status.html
@@ -86,7 +86,7 @@
     </div>
 </div>
 
-<script src="/static/js/status.js?v=1786747642"></script>
+<script src="/static/js/status.js?v=1786774296"></script>
 <script>
     $(document).ready(function () {
         $("#nav-link-status").addClass("active");