diff --git a/src/xrpld/app/ledger/detail/TransactionAcquire.cpp b/src/xrpld/app/ledger/detail/TransactionAcquire.cpp
index 0ba53095ce..77d314fb1a 100644
--- a/src/xrpld/app/ledger/detail/TransactionAcquire.cpp
+++ b/src/xrpld/app/ledger/detail/TransactionAcquire.cpp
@@ -198,7 +198,7 @@ TransactionAcquire::takeNodes(
 
         ConsensusTransSetSF sf(app_, app_.getTempNodeCache());
 
-        for (auto& d : data)
+        for (auto const& d : data)
         {
             if (d.first.isRoot())
             {
diff --git a/src/xrpld/overlay/detail/PeerImp.cpp b/src/xrpld/overlay/detail/PeerImp.cpp
index 810155a414..dcbfada66b 100644
--- a/src/xrpld/overlay/detail/PeerImp.cpp
+++ b/src/xrpld/overlay/detail/PeerImp.cpp
@@ -3465,11 +3465,8 @@ PeerImp::processLedgerRequest(std::shared_ptr<protocol::TMGetLedger> const& m)
              ++i)
         {
             auto const shaMapNodeId{deserializeSHAMapNodeID(m->nodeids(i))};
-            if (!shaMapNodeId.has_value())
-            {
-                JLOG(p_journal_.error()) << "processLedgerRequest: Invalid SHAMap node ID";
-                return;
-            }
+            XRPL_ASSERT(
+                shaMapNodeId.has_value(), "xrpl::PeerImp::processLedgerRequest : valid node ID");
 
             data.clear();
             data.reserve(Tuning::softMaxReplyNodes);