Merge pull request #2809 from lambdageek/dev/monoerror-threads