indraneel | #1665 | added null checks in EncounterSession Matcher