Removed extra error handler calls