Removed UnexpectedValueException