WP-1864 Added a catch block to handle when the map is first added