More guards against empty site lists