Making sure that we don't return endpoints with a null name