Improve error reporting for monad wrappers.
Update expected error messages in test cases.
Merge pull request #26 from davidlazar/master

Improve error messages