Change throwing exception from ArgumentException to CommandException.