Merge "Catch Illegal argument exception" into sc-dev