diff --git a/src/fne/network/FNENetwork.cpp b/src/fne/network/FNENetwork.cpp
index b4a8a7a1..e731e3d4 100644
--- a/src/fne/network/FNENetwork.cpp
+++ b/src/fne/network/FNENetwork.cpp
@@ -309,26 +309,13 @@ void FNENetwork::clock(uint32_t ms)
 
         case NET_FUNC_RPTL:                                                             // Repeater Login
             {
+                FNEPeerConnection* connection = nullptr;
                 if (peerId > 0 && (m_peers.find(peerId) == m_peers.end())) {
-                    FNEPeerConnection* connection = new FNEPeerConnection(peerId, address, addrLen);
+                    connection = new FNEPeerConnection(peerId, address, addrLen);
                     connection->lastPing(now);
                     connection->currStreamId(streamId);
 
-                    std::uniform_int_distribution<uint32_t> dist(DVM_RAND_MIN, DVM_RAND_MAX);
-                    connection->salt(dist(m_random));
-
-                    LogInfoEx(LOG_NET, "Repeater logging in with PEER %u, %s:%u", peerId, connection->address().c_str(), connection->port());
-
-                    connection->connectionState(NET_STAT_WAITING_AUTHORISATION);
-                    m_peers[peerId] = connection;
-
-                    // transmit salt to peer
-                    uint8_t salt[4U];
-                    ::memset(salt, 0x00U, 4U);
-                    __SET_UINT32(connection->salt(), salt, 0U);
-
-                    writePeerACK(peerId, salt, 4U);
-                    LogInfoEx(LOG_NET, "Challenge response send to PEER %u for login", peerId);
+                    setupRepeaterLogin(peerId, connection);
                 }
                 else {
                     writePeerNAK(peerId, TAG_REPEATER_LOGIN, address, addrLen);
@@ -336,17 +323,18 @@ void FNENetwork::clock(uint32_t ms)
                     // check if the peer is in our peer list -- if he is, and he isn't in a running state, reset
                     // the login sequence
                     if (peerId > 0 && (m_peers.find(peerId) != m_peers.end())) {
-                        FNEPeerConnection* connection = m_peers[peerId];
-                        LogMessage(LOG_NET, "PEER %u was RPTL NAKed, cleaning up peer connection, connectionState = %u", peerId, connection->connectionState());
+                        connection = m_peers[peerId];
                         if (connection != nullptr) {
-                            if (erasePeer(peerId)) {
-                                delete connection;
+                            LogMessage(LOG_NET, "PEER %u was RPTL NAKed, resetting up peer connection, connectionState = %u", peerId, connection->connectionState());
+                            if (connection->connectionState() == NET_STAT_RUNNING) {
+                                connection->lastPing(now);
+                                connection->currStreamId(streamId);
+
+                                setupRepeaterLogin(peerId, connection);
                             }
                         } else {
                             erasePeer(peerId);
-                            if (m_verbose) {
-                                LogWarning(LOG_NET, "PEER %u was RPTL NAKed while having no connection?, connectionState = %u", peerId, connection->connectionState());
-                            }
+                            LogWarning(LOG_NET, "PEER %u was RPTL NAKed while having no connection", peerId);
                         }
                     }
                 }
@@ -829,6 +817,30 @@ bool FNENetwork::erasePeer(uint32_t peerId)
     return false;
 }
 
+/// <summary>
+/// Helper to complete setting up a repeater login request.
+/// </summary>
+/// <param name="peerId"></param>
+/// <param name="connection"></param>
+void FNENetwork::setupRepeaterLogin(uint32_t peerId, FNEPeerConnection* connection)
+{
+    std::uniform_int_distribution<uint32_t> dist(DVM_RAND_MIN, DVM_RAND_MAX);
+    connection->salt(dist(m_random));
+
+    LogInfoEx(LOG_NET, "Repeater logging in with PEER %u, %s:%u", peerId, connection->address().c_str(), connection->port());
+
+    connection->connectionState(NET_STAT_WAITING_AUTHORISATION);
+    m_peers[peerId] = connection;
+
+    // transmit salt to peer
+    uint8_t salt[4U];
+    ::memset(salt, 0x00U, 4U);
+    __SET_UINT32(connection->salt(), salt, 0U);
+
+    writePeerACK(peerId, salt, 4U);
+    LogInfoEx(LOG_NET, "Challenge response send to PEER %u for login", peerId);
+}
+
 /// <summary>
 /// Helper to send the list of whitelisted RIDs to the specified peer.
 /// </summary>
diff --git a/src/fne/network/FNENetwork.h b/src/fne/network/FNENetwork.h
index 58b7c283..9280dd28 100644
--- a/src/fne/network/FNENetwork.h
+++ b/src/fne/network/FNENetwork.h
@@ -222,6 +222,9 @@ namespace network
         /// <summary>Helper to erase the peer from the peers list.</summary>
         bool erasePeer(uint32_t peerId);
 
+        /// <summary>Helper to complete setting up a repeater login request.</summary>
+        void setupRepeaterLogin(uint32_t peerId, FNEPeerConnection* connection);
+
         /// <summary>Helper to send the list of whitelisted RIDs to the specified peer.</summary>
         void writeWhitelistRIDs(uint32_t peerId, bool queueOnly = false);
         /// <summary>Helper to send the list of whitelisted RIDs to connected peers.</summary>
diff --git a/src/fne/network/RESTAPI.cpp b/src/fne/network/RESTAPI.cpp
index 42833118..b27e9d3d 100644
--- a/src/fne/network/RESTAPI.cpp
+++ b/src/fne/network/RESTAPI.cpp
@@ -1041,26 +1041,28 @@ void RESTAPI::restAPI_GetAffList(const HTTPPayload& request, HTTPPayload& reply,
                 network::FNEPeerConnection* peer = entry.second;
                 if (peer != nullptr) {
                     lookups::AffiliationLookup* affLookup = m_network->m_peerAffiliations[peerId];
-                    std::unordered_map<uint32_t, uint32_t> affTable = affLookup->grpAffTable();
-
-                    json::object peerObj = json::object();
-                    peerObj["peerId"].set<uint32_t>(peerId);
-
-                    json::array peerAffs = json::array();
-                    if (affLookup->grpAffSize() > 0U) {
-                        for (auto entry : affTable) {
-                            uint32_t srcId = entry.first;
-                            uint32_t dstId = entry.second;
-
-                            json::object affObj = json::object();
-                            affObj["srcId"].set<uint32_t>(srcId);
-                            affObj["dstId"].set<uint32_t>(dstId);
-                            peerAffs.push_back(json::value(affObj));
+                    if (affLookup != nullptr) {
+                        std::unordered_map<uint32_t, uint32_t> affTable = affLookup->grpAffTable();
+
+                        json::object peerObj = json::object();
+                        peerObj["peerId"].set<uint32_t>(peerId);
+
+                        json::array peerAffs = json::array();
+                        if (affLookup->grpAffSize() > 0U) {
+                            for (auto entry : affTable) {
+                                uint32_t srcId = entry.first;
+                                uint32_t dstId = entry.second;
+
+                                json::object affObj = json::object();
+                                affObj["srcId"].set<uint32_t>(srcId);
+                                affObj["dstId"].set<uint32_t>(dstId);
+                                peerAffs.push_back(json::value(affObj));
+                            }
                         }
-                    }
 
-                    peerObj["affiliations"].set<json::array>(peerAffs);
-                    affs.push_back(json::value(peerObj));
+                        peerObj["affiliations"].set<json::array>(peerAffs);
+                        affs.push_back(json::value(peerObj));
+                    }
                 }
             }
         }