[MISC] Check for peer relation when getting the primary endpoint

[MISC] Check for peer relation when getting the primary endpoint #2067