Put this back how it was. If getLocationThatSupportsVisits return null, then just don't don't make the getActiveVisit call. Alternately, I would think we want to show activeVisit in the header if the patient has any active visit at _any_ location, regardless of their sessionLocation.