Unblock

Please comment and review.
Yeah that is a bug. They should be using `err.message` instead of `err`. Can you fix those or should I? (Good catch!)