diff --git a/libuavcan/include/uavcan/node/service_client.hpp b/libuavcan/include/uavcan/node/service_client.hpp
index a509d232ba..6ffe1f6a04 100644
--- a/libuavcan/include/uavcan/node/service_client.hpp
+++ b/libuavcan/include/uavcan/node/service_client.hpp
@@ -190,7 +190,7 @@ public:
          * Starting the subscriber
          */
         const int subscriber_res = SubscriberType::startAsServiceResponseListener();
-        if (subscriber_res <= 0)
+        if (subscriber_res < 0)
         {
             UAVCAN_TRACE("ServiceClient", "Failed to start the subscriber, error: %i", subscriber_res);
             cancel();
diff --git a/libuavcan/include/uavcan/node/service_server.hpp b/libuavcan/include/uavcan/node/service_server.hpp
index 16e6cc0244..bfcffb0701 100644
--- a/libuavcan/include/uavcan/node/service_server.hpp
+++ b/libuavcan/include/uavcan/node/service_server.hpp
@@ -49,7 +49,7 @@ private:
 
         const int res = publisher_.publish(response_, TransferTypeServiceResponse, request.getSrcNodeID(),
             request.getTransferID());
-        if (res <= 0)
+        if (res < 0)
         {
             UAVCAN_TRACE("ServiceServer", "Response publication failure: %i", res);
             response_failure_count_++;