diff --git a/client/main.c b/client/main.c
index 584217a..7a100b5 100644
--- a/client/main.c
+++ b/client/main.c
@@ -2532,6 +2532,7 @@ static void client_ready(GDBusClient *client, void *user_data)
 int main(int argc, char *argv[])
 {
 	GDBusClient *client;
+	int status;
 
 	bt_shell_init(argc, argv, &opt);
 	bt_shell_set_menu(&main_menu);
@@ -2559,7 +2560,7 @@ int main(int argc, char *argv[])
 
 	g_dbus_client_set_ready_watch(client, client_ready, NULL);
 
-	bt_shell_run();
+	status = bt_shell_run();
 
 	g_dbus_client_unref(client);
 
@@ -2569,5 +2570,5 @@ int main(int argc, char *argv[])
 
 	g_free(auto_register_agent);
 
-	return 0;
+	return status;
 }