Actually wrap the relevant underlying error in some cases

Might help debugging #71

@burke @fw42 @Sirupsen