diff --git a/src/address.cpp b/src/address.cpp
index 3c5707c8..f8f1a12e 100644
--- a/src/address.cpp
+++ b/src/address.cpp
@@ -62,7 +62,7 @@ int zmq::address_t::to_string (std::string &addr_)
 #if !defined ZMQ_HAVE_WINDOWS && !defined ZMQ_HAVE_OPENVMS
     else if (protocol == "ipc") {
         if (resolved.ipc_addr) {
-            return resolved.tcp_addr->to_string(addr_);
+            return resolved.ipc_addr->to_string(addr_);
         }
     }
 #endif
diff --git a/src/socket_base.cpp b/src/socket_base.cpp
index 150bca19..9db664f3 100644
--- a/src/socket_base.cpp
+++ b/src/socket_base.cpp
@@ -546,7 +546,7 @@ int zmq::socket_base_t::term_endpoint (const char *addr_)
         return -1;
     }
 
-    //  Check whether message passed to the function is valid.
+    //  Check whether endpoint address passed to the function is valid.
     if (unlikely (!addr_)) {
         errno = EINVAL;
         return -1;