Exception changed to InvalidArgumentException