Merge pull request #3100 from lambdageek/dev/monoerror-exns