Remove some InvalidArgumentExceptions.