Merge pull request #2992 from lambdageek/dev/monoerror-other-invokes