diff --git a/obexd/client/pbap.c b/obexd/client/pbap.c
index a0e25ae..dc3c9e9 100644
--- a/obexd/client/pbap.c
+++ b/obexd/client/pbap.c
@@ -220,7 +220,7 @@ static void pbap_reset_path(struct session_data *session)
 {
 	int err = 0;
 	char **paths = NULL, **item;
-	struct pbap_data *pbapdata = session->priv;
+	struct pbap_data *pbapdata = session_get_data(session);
 
 	if (!pbapdata->path)
 		return;
@@ -239,7 +239,7 @@ static gint pbap_set_path(struct session_data *session, const char *path)
 {
 	int err = 0;
 	char **paths = NULL, **item;
-	struct pbap_data *pbapdata = session->priv;
+	struct pbap_data *pbapdata = session_get_data(session);
 
 	if (!path)
 		return OBEX_RSP_BAD_REQUEST;
@@ -525,7 +525,7 @@ static DBusMessage *pull_vcard_listing(struct session_data *session,
 
 static int set_format(struct session_data *session, const char *formatstr)
 {
-	struct pbap_data *pbapdata = session->priv;
+	struct pbap_data *pbapdata = session_get_data(session);
 
 	if (!formatstr || g_str_equal(formatstr, "")) {
 		pbapdata->format = FORMAT_VCARD21;
@@ -544,7 +544,7 @@ static int set_format(struct session_data *session, const char *formatstr)
 
 static int set_order(struct session_data *session, const char *orderstr)
 {
-	struct pbap_data *pbapdata = session->priv;
+	struct pbap_data *pbapdata = session_get_data(session);
 
 	if (!orderstr || g_str_equal(orderstr, "")) {
 		pbapdata->order = ORDER_INDEXED;
@@ -590,7 +590,7 @@ static uint64_t get_filter_mask(const char *filterstr)
 
 static int add_filter(struct session_data *session, const char *filterstr)
 {
-	struct pbap_data *pbapdata = session->priv;
+	struct pbap_data *pbapdata = session_get_data(session);
 	uint64_t mask;
 
 	mask = get_filter_mask(filterstr);
@@ -604,7 +604,7 @@ static int add_filter(struct session_data *session, const char *filterstr)
 
 static int remove_filter(struct session_data *session, const char *filterstr)
 {
-	struct pbap_data *pbapdata = session->priv;
+	struct pbap_data *pbapdata = session_get_data(session);
 	uint64_t mask;
 
 	mask = get_filter_mask(filterstr);
@@ -676,7 +676,7 @@ static DBusMessage *pbap_pull_all(DBusConnection *connection,
 					DBusMessage *message, void *user_data)
 {
 	struct session_data *session = user_data;
-	struct pbap_data *pbapdata = session->priv;
+	struct pbap_data *pbapdata = session_get_data(session);
 	DBusMessage * err;
 	char *name;
 
@@ -697,7 +697,7 @@ static DBusMessage *pbap_pull_vcard(DBusConnection *connection,
 					DBusMessage *message, void *user_data)
 {
 	struct session_data *session = user_data;
-	struct pbap_data *pbapdata = session->priv;
+	struct pbap_data *pbapdata = session_get_data(session);
 	struct pullvcardentry_apparam apparam;
 	const char *name;
 
@@ -740,7 +740,7 @@ static DBusMessage *pbap_list(DBusConnection *connection,
 					DBusMessage *message, void *user_data)
 {
 	struct session_data *session = user_data;
-	struct pbap_data *pbapdata = session->priv;
+	struct pbap_data *pbapdata = session_get_data(session);
 
 	if (!pbapdata->path)
 		return g_dbus_create_error(message,
@@ -754,7 +754,7 @@ static DBusMessage *pbap_search(DBusConnection *connection,
 					DBusMessage *message, void *user_data)
 {
 	struct session_data *session = user_data;
-	struct pbap_data *pbapdata = session->priv;
+	struct pbap_data *pbapdata = session_get_data(session);
 	char *field, *value;
 	guint8 attrib;
 
@@ -789,7 +789,7 @@ static DBusMessage *pbap_get_size(DBusConnection *connection,
 					DBusMessage *message, void *user_data)
 {
 	struct session_data *session = user_data;
-	struct pbap_data *pbapdata = session->priv;
+	struct pbap_data *pbapdata = session_get_data(session);
 	DBusMessage * err;
 	char *name;
 
@@ -848,7 +848,7 @@ static DBusMessage *pbap_set_filter(DBusConnection *connection,
 					DBusMessage *message, void *user_data)
 {
 	struct session_data *session = user_data;
-	struct pbap_data *pbapdata = session->priv;
+	struct pbap_data *pbapdata = session_get_data(session);
 	char **filters, **item;
 	gint size;
 	uint64_t oldfilter = pbapdata->filter;
@@ -881,7 +881,7 @@ static DBusMessage *pbap_get_filter(DBusConnection *connection,
 					DBusMessage *message, void *user_data)
 {
 	struct session_data *session = user_data;
-	struct pbap_data *pbapdata = session->priv;
+	struct pbap_data *pbapdata = session_get_data(session);
 	gchar **filters = NULL;
 	gint size;
 	DBusMessage *reply;
@@ -937,11 +937,14 @@ gboolean pbap_register_interface(DBusConnection *connection, const char *path,
 				void *user_data, GDBusDestroyFunction destroy)
 {
 	struct session_data *session = user_data;
+	void *priv;
 
-	session->priv = g_try_malloc0(sizeof(struct pbap_data));
-	if (!session->priv)
+	priv = g_try_malloc0(sizeof(struct pbap_data));
+	if (!priv)
 		return FALSE;
 
+	session_set_data(session, priv);
+
 	return g_dbus_register_interface(connection, path, PBAP_INTERFACE,
 				pbap_methods, NULL, NULL, user_data, destroy);
 }
@@ -950,8 +953,8 @@ void pbap_unregister_interface(DBusConnection *connection, const char *path,
 				void *user_data)
 {
 	struct session_data *session = user_data;
+	void *priv = session_get_data(session);
 
 	g_dbus_unregister_interface(connection, path, PBAP_INTERFACE);
-	if (session->priv)
-		g_free(session->priv);
+	g_free(priv);
 }
diff --git a/obexd/client/session.c b/obexd/client/session.c
index 4f920d7..d64d0ce 100644
--- a/obexd/client/session.c
+++ b/obexd/client/session.c
@@ -1626,3 +1626,13 @@ int session_register(struct session_data *session)
 
 	return 0;
 }
+
+void *session_get_data(struct session_data *session)
+{
+	return session->priv;
+}
+
+void session_set_data(struct session_data *session, void *priv)
+{
+	session->priv = priv;
+}
diff --git a/obexd/client/session.h b/obexd/client/session.h
index 4a90e27..d713db8 100644
--- a/obexd/client/session.h
+++ b/obexd/client/session.h
@@ -78,3 +78,5 @@ int session_pull(struct session_data *session,
 				const char *type, const char *filename,
 				session_callback_t function, void *user_data);
 int session_register(struct session_data *session);
+void *session_get_data(struct session_data *session);
+void session_set_data(struct session_data *session, void *priv);