diff --git a/src/cxxcaosdbcli.cpp b/src/cxxcaosdbcli.cpp
index b31f70386cec327b9be23261976d5a61d354144d..bb089f5a4f117448238c161eb2fc82fb21ed7fdc 100644
--- a/src/cxxcaosdbcli.cpp
+++ b/src/cxxcaosdbcli.cpp
@@ -68,5 +68,11 @@ auto main() -> int {
   } catch (const caosdb::exceptions::ConfigurationError &exc) {
     std::cout << "ConfigurationError: " << exc.what() << std::endl;
     return exc.GetCode();
+  } catch (const std::exception& exc) {
+    std::cout << "Exception: " << exc.what() << std::endl;
+    return 1;
+  } catch (...) {
+    std::cout << "Some other exception." << std::endl;
+    return 2;
   }
 }