InvalidArgumentExceptions fixed.