Remove InvalidArgumentException breaking b/c in certain use cases