when.catch instead of fail

Fixes #20