diff --git a/docs/changes/2594.optimization.rst b/docs/changes/2594.optimization.rst
new file mode 100644
index 00000000000..408857af226
--- /dev/null
+++ b/docs/changes/2594.optimization.rst
@@ -0,0 +1,5 @@
+Update exception handling in tools
+
+- Remove ``SystemExit`` handling in ``Tool.run()``
+- Add a possibility to register custom exceptions and handle them in ``Tool.run()``
+  with the preservation of the exit code.