Add a rescue handler

I keep re-implementing this...
v0.13