fix(errors): Key logic so display is overridden correctly (#25516)

fix(errors): Key logic so display is overridden correctly (#25516) #8396