Tweak a few error handling things.