Merge pull request #2608 from ludovic-henry/monoerror-icall