when.catch instead of fail
Merge pull request #21 from phtrivier/master

when.catch instead of fail