From f4e29767ee834f467498388da7f505ef14b61cdc Mon Sep 17 00:00:00 2001
From: Jefferson Rabb <jeff@atavist.net>
Date: Thu, 5 Dec 2019 08:02:10 -0500
Subject: [PATCH] Removing zoom control causes crash if it has already been
 removed prior. Wrap in try/catch to fix.

---
 extensions/blocks/map/component.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/extensions/blocks/map/component.js b/extensions/blocks/map/component.js
index 4f64ce0ef836..27b40efbddc5 100644
--- a/extensions/blocks/map/component.js
+++ b/extensions/blocks/map/component.js
@@ -210,7 +210,9 @@ export class Map extends Component {
 				},
 			} );
 			this.setState( { boundsSetProgrammatically: true } );
-			map.removeControl( zoomControl );
+			try {
+				map.removeControl( zoomControl );
+			} catch ( e ) {}
 			return;
 		}
 		// If there is only one point, center map around it.