diff --git a/src/modules/uavcan/uavcan_servers.cpp b/src/modules/uavcan/uavcan_servers.cpp
index 52f0ce9697..824b5182e2 100644
--- a/src/modules/uavcan/uavcan_servers.cpp
+++ b/src/modules/uavcan/uavcan_servers.cpp
@@ -98,6 +98,7 @@ UavcanServers::~UavcanServers()
 	if (_mutex_inited) {
 		(void)Lock::deinit(_subnode_mutex);
 	}
+
 	_main_node.getDispatcher().removeRxFrameListener();
 }
 
@@ -164,9 +165,9 @@ int UavcanServers::start(uavcan::INode &main_node)
 
 	rv = pthread_create(&_instance->_subnode_thread, &tattr, static_cast<pthread_startroutine_t>(run_trampoline), NULL);
 
-	if (rv < 0) {
-		warnx("pthread_create() failed: %d", errno);
-		rv =  -errno;
+	if (rv != 0) {
+		rv = -rv;
+		warnx("pthread_create() failed: %d", rv);
 		delete _instance;
 		_instance = nullptr;
 	}