SERENGETI-1656
Handle failures a bit more gracefully