Added endpoint check.