Tweak error handling