Rest of changes into InvalidArgumentException