minor tweks to support null Encounters