Merge "OPP: catch IllegalArgumentException exception to avoid FC"