Improve how failures are handled.