Change Exception to InvalidArgumentException