diff --git a/src/tools/pw-cat.c b/src/tools/pw-cat.c
index 578df99bd..70570aa0f 100644
--- a/src/tools/pw-cat.c
+++ b/src/tools/pw-cat.c
@@ -1583,6 +1583,8 @@ error_connect_fail:
 	if (data.stream)
 		pw_stream_destroy(data.stream);
 error_no_stream:
+	if (data.registry)
+		pw_proxy_destroy((struct pw_proxy*)data.registry);
 error_no_registry:
 	pw_core_disconnect(data.core);
 error_ctx_connect_failed:
@@ -1598,6 +1600,7 @@ error_bad_file:
 		sf_close(data.file);
 	if (data.midi.file)
 		midi_file_close(data.midi.file);
+	pw_deinit();
 	return exit_code;
 
 error_usage: