Make sure the peer name is always available