Merge pull request #2684 from ludovic-henry/monoerror-exception