Remove unnecessary error handling