Merge pull request #2821 from lambdageek/dev/monoerror-assembly