Implemented bounds checking on Location