Merge "Catch IllegalArgumentException for error message"

No match.