diff --git a/obexd/src/manager.c b/obexd/src/manager.c
index b86d3ef..42acd71 100644
--- a/obexd/src/manager.c
+++ b/obexd/src/manager.c
@@ -854,6 +854,7 @@ static void agent_reply(DBusPendingCall *call, gpointer user_data)
 				DBUS_TYPE_INVALID)) {
 		/* Splits folder and name */
 		const gchar *slash = strrchr(name, '/');
+		debug("Agent replied with %s", name);
 		if (!slash) {
 			agent->new_name = g_strdup(name);
 			agent->new_folder = NULL;
@@ -910,7 +911,7 @@ int request_authorization(gint32 cid, int fd, const gchar *filename,
 	addrlen = sizeof(addr);
 
 	if (getpeername(fd, (struct sockaddr *) &addr, &addrlen) < 0)
-		return -1;
+		return -errno;
 
 	ba2str(&addr.rc_bdaddr, address);
 
diff --git a/obexd/src/obex.c b/obexd/src/obex.c
index 3172c81..d4488b8 100644
--- a/obexd/src/obex.c
+++ b/obexd/src/obex.c
@@ -547,6 +547,8 @@ gint os_prepare_put(struct obex_session *os)
 		w = write(os->fd, os->buf + len, os->offset - len);
 		if (w < 0) {
 			gint err = errno;
+			error("write(%s): %s (%d)", path, strerror(errno),
+									errno);
 			if (err == EINTR)
 				continue;
 			else