Merge pull request #3029 from lambdageek/dev/simplify-monoerror-threads