1 files changed, 5 insertions, 1 deletions
diff --git a/web/js/map-OpenLayers.js b/web/js/map-OpenLayers.js
index 0a1c947a0..7d0f9076e 100644
--- a/web/js/map-OpenLayers.js
+++ b/web/js/map-OpenLayers.js
@@ -96,6 +96,7 @@ $.extend(fixmystreet.utils, {
             fixmystreet.markers.features[0].move(lonlat);
         } else {
             var markers = fixmystreet.maps.markers_list( [ [ lonlat.lat, lonlat.lon, fixmystreet.pin_new_report_colour ] ], false );
+            fixmystreet.bbox_strategy.layer.protocol.abort(fixmystreet.bbox_strategy.response);
             fixmystreet.bbox_strategy.deactivate();
             fixmystreet.markers.removeAllFeatures();
             fixmystreet.markers.addFeatures( markers );
@@ -125,7 +126,7 @@ $.extend(fixmystreet.utils, {
                     fixmystreet.map.getProjectionObject()
                 );
             }
-            var id = +pin[3];
+            var id = pin[3] === undefined ? pin[3] : +pin[3];
             var marker_size = (id === window.selected_problem_id) ? selected_size : size;
             var marker = new OpenLayers.Feature.Vector(loc, {
                 colour: pin[2],
@@ -578,6 +579,9 @@ $.extend(fixmystreet.utils, {
         });
         fixmystreet.markers.events.register( 'loadstart', null, fixmystreet.maps.loading_spinner.show);
         fixmystreet.markers.events.register( 'loadend', null, fixmystreet.maps.loading_spinner.hide);
+        OpenLayers.Request.XMLHttpRequest.onabort = function() {
+            fixmystreet.markers.events.triggerEvent("loadend", {response: null});
+        };
 
         var markers = fixmystreet.maps.markers_list( fixmystreet.pins, true );
         fixmystreet.markers.addFeatures( markers );