ISPN-3366 Harden the outdated topology checks