Add some graceful failure scenarios