add catching of thunk errors
Release 2.1.0