Tweak to error handler.