removed unnecessary error handler