Remove unnecessary error handler