error handler changes