X-Git-Url: https://git.lttng.org/?p=lttng-tools.git;a=blobdiff_plain;f=src%2Fbin%2Flttng%2Flttng.cpp;h=af1d3f4882cfd7fc6894257099a85f785cd5f6b0;hp=b84fe3407069613d0c345956876d6dce73f76008;hb=HEAD;hpb=d5ed3e6f3a8b52d7f2a3e2277873e0f1914ba515

diff --git a/src/bin/lttng/lttng.cpp b/src/bin/lttng/lttng.cpp
index b84fe3407..48b02c627 100644
--- a/src/bin/lttng/lttng.cpp
+++ b/src/bin/lttng/lttng.cpp
@@ -234,7 +234,13 @@ static int handle_command(int argc, char **argv)
 	while (cmd->name != nullptr) {
 		/* Find command */
 		if (strcmp(argv[0], cmd->name) == 0) {
-			ret = cmd->func(argc, (const char **) argv);
+			try {
+				ret = cmd->func(argc, (const char **) argv);
+			} catch (const std::exception& e) {
+				ERR_FMT("{}", e.what());
+				ret = CMD_ERROR;
+			}
+
 			goto end;
 		}
 		i++;
@@ -484,7 +490,7 @@ int main(int argc, char **argv)
 	try {
 		return _main(argc, argv);
 	} catch (const std::exception& e) {
-		ERR_FMT("Unhandled exception caught by client: %s", e.what());
+		ERR_FMT("Unhandled exception caught by client: {}", e.what());
 		abort();
 	}
 }