BR 2496848: Tighten ea checks