Remove unnecessary catching