diff --git a/obexd/client/session.c b/obexd/client/session.c
index f288ecd..9f02512 100644
--- a/obexd/client/session.c
+++ b/obexd/client/session.c
@@ -1277,6 +1277,10 @@ int obc_session_send(struct obc_session *session, const char *filename,
 	if (transfer == NULL)
 		return -EINVAL;
 
+	err = obc_transfer_set_file(transfer);
+	if (err < 0)
+		goto fail;
+
 	/* Transfer should start if it is the first in the pending list */
 	if (transfer != session->pending->data)
 		return 0;
diff --git a/obexd/client/transfer.c b/obexd/client/transfer.c
index ef0912f..c481378 100644
--- a/obexd/client/transfer.c
+++ b/obexd/client/transfer.c
@@ -569,8 +569,6 @@ int obc_transfer_put(struct obc_transfer *transfer, transfer_callback_t func,
 	GObex *obex;
 	GObexPacket *req;
 	GObexDataProducer data_cb;
-	struct stat st;
-	int fd;
 
 	if (transfer->xfer != 0)
 		return -EALREADY;
@@ -580,20 +578,6 @@ int obc_transfer_put(struct obc_transfer *transfer, transfer_callback_t func,
 		goto done;
 	}
 
-	fd = open(transfer->filename, O_RDONLY);
-	if (fd < 0) {
-		error("open(): %s(%d)", strerror(errno), errno);
-		return -errno;
-	}
-
-	if (fstat(fd, &st) < 0) {
-		close(fd);
-		error("fstat(): %s(%d)", strerror(errno), errno);
-		return -errno;
-	}
-
-	transfer->fd = fd;
-	transfer->size = st.st_size;
 	data_cb = put_xfer_progress;
 
 done:
@@ -673,3 +657,26 @@ gint64 obc_transfer_get_size(struct obc_transfer *transfer)
 {
 	return transfer->size;
 }
+
+int obc_transfer_set_file(struct obc_transfer *transfer)
+{
+	int fd;
+	struct stat st;
+
+	fd = open(transfer->filename, O_RDONLY);
+	if (fd < 0) {
+		error("open(): %s(%d)", strerror(errno), errno);
+		return -errno;
+	}
+
+	if (fstat(fd, &st) < 0) {
+		error("fstat(): %s(%d)", strerror(errno), errno);
+		close(fd);
+		return -errno;
+	}
+
+	transfer->fd = fd;
+	transfer->size = st.st_size;
+
+	return 0;
+}
diff --git a/obexd/client/transfer.h b/obexd/client/transfer.h
index ba53fd1..c051cbd 100644
--- a/obexd/client/transfer.h
+++ b/obexd/client/transfer.h
@@ -55,3 +55,4 @@ void obc_transfer_clear_buffer(struct obc_transfer *transfer);
 void obc_transfer_set_name(struct obc_transfer *transfer, const char *name);
 const char *obc_transfer_get_path(struct obc_transfer *transfer);
 gint64 obc_transfer_get_size(struct obc_transfer *transfer);
+int obc_transfer_set_file(struct obc_transfer *transfer);