Merge pull request #3106 from lambdageek/dev/monoerror-unhandled