Added Geolocation Token Store to prevent crash [fix #147]