diff --git a/obexd/plugins/opp.c b/obexd/plugins/opp.c
index fa3ee91..c7ddc63 100644
--- a/obexd/plugins/opp.c
+++ b/obexd/plugins/opp.c
@@ -154,12 +154,15 @@ skip_auth:
 
 	path = g_build_filename(folder, name, NULL);
 
-	manager_emit_transfer_started(os);
-
 	err = obex_put_stream_start(os, path);
 
 	g_free(path);
 
+	if (err < 0)
+		goto failed;
+
+	manager_emit_transfer_started(os);
+
 failed:
 	g_free(folder);
 	g_free(name);