removed the double wrap, by not passing an Error object to the wrap function.  fixes #824
if no error call with `null`
Merge remote-tracking branch 'm4tty/824-fix'
Fixed wrap issue when error is not an object
Merge remote-tracking branch 'Raynos/patch-2'