throw ValueError instead on InvalidArgumentException

throw ValueError instead on InvalidArgumentException #2