diff --git a/src/device.c b/src/device.c
index fd6e5b0..2c741d3 100644
--- a/src/device.c
+++ b/src/device.c
@@ -2340,8 +2340,7 @@ done:
 		}
 
 		g_dbus_send_message(dbus_conn,
-			btd_error_failed(dev->connect,
-						btd_error_bredr_str(err)));
+				btd_error_bredr_errno(dev->connect, err));
 	} else {
 		/* Start passive SDP discovery to update known services */
 		if (dev->bredr && !dev->svc_refreshed && dev->refresh_discovery)
@@ -2698,7 +2697,7 @@ static DBusMessage *connect_profiles(struct btd_device *dev, uint8_t bdaddr_type
 	if (err < 0) {
 		if (err == -EALREADY)
 			return dbus_message_new_method_return(msg);
-		return btd_error_failed(msg, btd_error_bredr_str(err));
+		return btd_error_bredr_errno(msg, err);
 	}
 
 	dev->connect = dbus_message_ref(msg);
@@ -3001,10 +3000,12 @@ static void browse_request_complete(struct browse_req *req, uint8_t type,
 			if (err == 0)
 				goto done;
 		}
-		reply = btd_error_failed(req->msg,
-				bdaddr_type == BDADDR_BREDR ?
-				btd_error_bredr_str(err) :
-				btd_error_le_str(err));
+
+		if (bdaddr_type == BDADDR_BREDR)
+			reply = btd_error_bredr_errno(req->msg, err);
+		else
+			reply = btd_error_le_errno(req->msg, err);
+
 		goto done;
 	}
 
@@ -6281,8 +6282,7 @@ done:
 
 	if (device->connect) {
 		if (err < 0)
-			reply = btd_error_failed(device->connect,
-						btd_error_le_str(err));
+			reply = btd_error_le_errno(device->connect, err);
 		else
 			reply = dbus_message_new_method_return(device->connect);