UnexpectedValueException changed into InvalidArgumentException