Changes to handle system failures better.