Improved Exceptional Handling on locations (#215)