Merge "Catch IllegalArgumentException for error message"