Merge "Don't ignore invalid export location ip version"