Improved handling for failure modes