Merge "It helps to catch the right exception." into jb-mr2-dev