EP-113: Correct some issues in the availability check.