fix for recovering when exception is thrown
Merge branch 'master' of https://github.com/cakey/ekon