Tweak to error handling.