XCLCOUD-1048 exceptions refactoring