Index: /source/ariba/utility/transport/rfcomm/rfcomm.cpp
===================================================================
--- /source/ariba/utility/transport/rfcomm/rfcomm.cpp	(revision 5421)
+++ /source/ariba/utility/transport/rfcomm/rfcomm.cpp	(revision 5422)
@@ -203,5 +203,5 @@
 void rfcomm::handle_accept(const error_code& error, link_info* info) {
 	if (error) {
-		logging_error( "Error waiting for new connections. Error code: "<< strerror(errno)
+		logging_error( "Error waiting for new connections. Error code: "<< error.message()
 				<< ", trying to recover (attempt " << accept_retries << ")");
 
@@ -239,5 +239,6 @@
 void rfcomm::handle_connect( const error_code& error, link_info* info ) {
 	if (error) {
-		logging_error( "Can not connect. Error code: "<< strerror(errno) << " Retrying ... "
+		logging_error( "Can not connect. Error code: "
+				<< error.message() << " Retrying ... "
 				"(attempt " << info->connect_retries << ")" );
 
@@ -299,5 +300,6 @@
 	// handle error
 	if (error) {
-		logging_error("Failed to receive message payload. Error code: "<< strerror(errno));
+		logging_error("Failed to receive message payload. Error code: "
+				<< error.message() );
 		shutdown(info);
 		return;
@@ -335,5 +337,6 @@
 	// check error
 	if (error) {
-		logging_error("Failed to receive message payload. Error code: "<< strerror(errno));
+		logging_error("Failed to receive message payload. Error code: "
+			<< error.message() );
 		shutdown(info);
 		return;
@@ -392,5 +395,5 @@
 	// handle error
 	if (error) {
-		logging_error( "Message sent error. Error code: "<< strerror(errno) );
+		logging_error( "Message sent error. Error code: "<< error.message() );
 		shutdown(info);
 		return;