Merge "Catch remote exception" into sc-dev