Merge pull request #4816 from BrzVlad/fix-remoting-exception