Get rid of handle_errors