Handle more failure conditions