Merge "Revise the IllegalArgumentException check" into sc-dev