Centralize disabled endpoint check, add endpoint scheme to disambiguate