diff --git a/reflector/Reflector.cpp b/reflector/Reflector.cpp
index d8e49a4..8d4fc76 100644
--- a/reflector/Reflector.cpp
+++ b/reflector/Reflector.cpp
@@ -686,13 +686,7 @@ void CReflector::GetDHTConfig(const std::string &cs)
 {
 	static SUrfdConfig1 cfg;
 	cfg.timestamp = 0;	// every time this is called, zero the timestamp
-	auto item = g_GateKeeper.GetInterlinkMap()->FindMapItem(cs);
-	g_GateKeeper.ReleaseInterlinkMap();
-	if (nullptr == item)
-	{
-		std::cerr << "Can't Get() for " << cs << " because it doesn't exist" << std::endl;
-		return;
-	}
+
 	std::cout << "Getting " << cs << " connection info..." << std::endl;
 
 	// we only want the configuration section of the reflector's document
diff --git a/reflector/URFProtocol.cpp b/reflector/URFProtocol.cpp
index 52d7cb5..d14d6a0 100644
--- a/reflector/URFProtocol.cpp
+++ b/reflector/URFProtocol.cpp
@@ -312,7 +312,9 @@ void CURFProtocol::HandlePeerLinks(void)
 	for ( auto it=ilmap->begin(); it!=ilmap->end(); it++ )
 	{
 		const auto cs = it->first;
-		if ((0 == cs.substr(0, 3).compare("URF")) && (nullptr==peers->FindPeer(CCallsign(cs), EProtocol::urf)))
+		CCallsign callsign;
+		callsign.SetCallsign(cs, false);
+		if ((0 == cs.substr(0, 3).compare("URF")) && (nullptr==peers->FindPeer(callsign, EProtocol::urf)))
 		{
 #ifndef NO_DHT
 			it->second.UpdateIP(g_Configure.GetString(g_Keys.ip.ipv6address).empty());