Add the check even here when dealing with ipv6 addreses