diff --git a/src/dealer.cpp b/src/dealer.cpp
index 8da06960..8d86cc54 100644
--- a/src/dealer.cpp
+++ b/src/dealer.cpp
@@ -40,14 +40,14 @@ void zmq::dealer_t::xattach_pipe (pipe_t *pipe_, bool icanhasall_)
     zmq_assert (pipe_);
 
     if (probe_new_peers) {
-        int rc, ok;
+        int rc;
         msg_t probe_msg_;
 
         rc = probe_msg_.init ();
         errno_assert (rc == 0);
 
-        ok = pipe_->write (&probe_msg_);
-        zmq_assert (ok);
+        rc = pipe_->write (&probe_msg_);
+        zmq_assert (rc);
         pipe_->flush ();
 
         rc = probe_msg_.close ();
diff --git a/src/router.cpp b/src/router.cpp
index 4ce2476e..654e4516 100644
--- a/src/router.cpp
+++ b/src/router.cpp
@@ -404,15 +404,12 @@ bool zmq::router_t::identify_peer (pipe_t *pipe_)
         rc = probe_msg_.init ();
         errno_assert (rc == 0);
 
-        ok = pipe_->write (&probe_msg_);
+        rc = pipe_->write (&probe_msg_);
+        zmq_assert (rc);
         pipe_->flush ();
 
         rc = probe_msg_.close ();
         errno_assert (rc == 0);
-
-        //  Ignore not probed peers
-        if (!ok)
-            return false;
     }
 
     return true;