diff --git a/fairmq/ofi/Context.cxx b/fairmq/ofi/Context.cxx
index ec7b7d82..64aa74c0 100644
--- a/fairmq/ofi/Context.cxx
+++ b/fairmq/ofi/Context.cxx
@@ -258,8 +258,8 @@ auto Context::InsertAddressVector(sockaddr_in address) -> fi_addr_t
 {
     fi_addr_t mappedAddress;
     auto ret = fi_av_insert(fOfiAddressVector, &address, 1, &mappedAddress, 0, nullptr);
-    if (ret != FI_SUCCESS)
-        throw ContextError{tools::ToString("Failed to insert address into ofi address vector, reason: ", fi_strerror(ret))};
+    if (ret != 1)
+        throw ContextError{tools::ToString("Failed to insert address into ofi address vector")};
 
     return ret;
 }
diff --git a/fairmq/ofi/Socket.cxx b/fairmq/ofi/Socket.cxx
index 0c3598c4..f5dd88b9 100644
--- a/fairmq/ofi/Socket.cxx
+++ b/fairmq/ofi/Socket.cxx
@@ -138,7 +138,7 @@ auto Socket::ProcessDataAddressAnnouncement(std::unique_ptr<ControlMessage> ctrl
     remoteAddr.sin_port = daa.port();
     remoteAddr.sin_addr.s_addr = daa.ipv4();
 
-    LOG(debug) << Context::ConvertAddress(remoteAddr);
+    LOG(debug) << "Data address announcement of remote ofi endpoint received: " << Context::ConvertAddress(remoteAddr);
     fRemoteDataAddr = fContext.InsertAddressVector(remoteAddr);
 }