update to error handler