make sure deferreds aren't unwrapped in 'catch', fixes #7