Added location error rescue