improved failure tolerance, added test for failure scenario