Merge branch 'defensive-js'

1 files changed, 7 insertions, 0 deletions

diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index ae86269c9..cd2283491 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -304,6 +304,9 @@ $.extend(fixmystreet.utils, {
       // fixmystreet.select_feature).
 
       markers_highlight: function(problem_id) {
+          if (!fixmystreet.markers) {
+              return;
+          }
           for (var i = 0; i < fixmystreet.markers.features.length; i++) {
               if (typeof problem_id == 'undefined') {
                   // There is no highlighted marker, so unfade this marker
@@ -791,6 +794,10 @@ $.extend(fixmystreet.utils, {
 
     $(function(){
 
+        if (!document.getElementById('map')) {
+            return;
+        }
+
         // Set specific map config - some other JS included in the
         // template should define this
         fixmystreet.maps.config();