Fail Gracefully attempt 3

I think this actually works.