Merge pull request #2824 from lambdageek/dev/monoerror-icalls-noraise