[IMP] Better checking of address of partner