diff --git a/fairmq/examples/4-copypush/FairMQExample4Sink.cxx b/fairmq/examples/4-copypush/FairMQExample4Sink.cxx
index 48631925..2444cade 100644
--- a/fairmq/examples/4-copypush/FairMQExample4Sink.cxx
+++ b/fairmq/examples/4-copypush/FairMQExample4Sink.cxx
@@ -30,9 +30,10 @@ void FairMQExample4Sink::Run()
     {
         std::unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage());
 
-        fChannels.at("data-in").at(0).Receive(msg);
-
-        LOG(INFO) << "Received message: \"" << *(static_cast<int*>(msg->GetData())) << "\"";
+        if (fChannels.at("data-in").at(0).Receive(msg) >= 0)
+        {
+            LOG(INFO) << "Received message: \"" << *(static_cast<int*>(msg->GetData())) << "\"";
+        }
     }
 }
 
diff --git a/fairmq/examples/5-req-rep/FairMQExample5Client.cxx b/fairmq/examples/5-req-rep/FairMQExample5Client.cxx
index 2ccf0316..4968c5bc 100644
--- a/fairmq/examples/5-req-rep/FairMQExample5Client.cxx
+++ b/fairmq/examples/5-req-rep/FairMQExample5Client.cxx
@@ -49,10 +49,11 @@ void FairMQExample5Client::Run()
 
         if (fChannels.at("data").at(0).Send(request) > 0)
         {
-            fChannels.at("data").at(0).Receive(reply);
-            LOG(INFO) << "Received reply from server: \"" << string(static_cast<char*>(reply->GetData()), reply->GetSize()) << "\"";
+            if (fChannels.at("data").at(0).Receive(reply) >= 0)
+            {
+                LOG(INFO) << "Received reply from server: \"" << string(static_cast<char*>(reply->GetData()), reply->GetSize()) << "\"";
+            }
         }
-
     }
 }
 
diff --git a/fairmq/test/pub-sub/FairMQTestPub.cxx b/fairmq/test/pub-sub/FairMQTestPub.cxx
index 7695cd6b..194259af 100644
--- a/fairmq/test/pub-sub/FairMQTestPub.cxx
+++ b/fairmq/test/pub-sub/FairMQTestPub.cxx
@@ -24,20 +24,23 @@ FairMQTestPub::FairMQTestPub()
 void FairMQTestPub::Run()
 {
     std::unique_ptr<FairMQMessage> ready1Msg(fTransportFactory->CreateMessage());
-    fChannels.at("control").at(0).Receive(ready1Msg);
+    int r1 = fChannels.at("control").at(0).Receive(ready1Msg);
     std::unique_ptr<FairMQMessage> ready2Msg(fTransportFactory->CreateMessage());
-    fChannels.at("control").at(0).Receive(ready2Msg);
+    int r2 = fChannels.at("control").at(0).Receive(ready2Msg);
 
-    std::unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage());
-    fChannels.at("data").at(0).Send(msg);
-
-    std::unique_ptr<FairMQMessage> ack1Msg(fTransportFactory->CreateMessage());
-    std::unique_ptr<FairMQMessage> ack2Msg(fTransportFactory->CreateMessage());
-    if (fChannels.at("control").at(0).Receive(ack1Msg) >= 0)
+    if (r1 >= 0 && r2 >= 0)
     {
-        if (fChannels.at("control").at(0).Receive(ack2Msg) >= 0)
+        std::unique_ptr<FairMQMessage> msg(fTransportFactory->CreateMessage());
+        fChannels.at("data").at(0).Send(msg);
+
+        std::unique_ptr<FairMQMessage> ack1Msg(fTransportFactory->CreateMessage());
+        std::unique_ptr<FairMQMessage> ack2Msg(fTransportFactory->CreateMessage());
+        if (fChannels.at("control").at(0).Receive(ack1Msg) >= 0)
         {
-            LOG(INFO) << "PUB-SUB test successfull";
+            if (fChannels.at("control").at(0).Receive(ack2Msg) >= 0)
+            {
+                LOG(INFO) << "PUB-SUB test successfull";
+            }
         }
     }
 }