Merge pull request #3024 from lambdageek/dev/monoerror-endinvoke