Merge branch 'master' of git+ssh://git.sflphone.org/var/repos/sflphone/git/sflphone

daemon/src/dbus/dbusmanager.cpp

@@ -80,11 +80,27 @@ DBusManager::~DBusManager()
 
 void DBusManager::exec()
 {
+    try {
         dispatcher_.enter();
+    } catch (const DBus::Error &err) {
+        ERROR("%s: %s, exiting\n", err.name(), err.what());
+        ::exit(EXIT_FAILURE);
+    } catch (const std::exception &err) {
+        ERROR("%s: %s, exiting\n", err.what());
+        ::exit(EXIT_FAILURE);
+    }
 }
 
 void
 DBusManager::exit()
 {
+    try {
         dispatcher_.leave();
+    } catch (const DBus::Error &err) {
+        ERROR("%s: %s, exiting\n", err.name(), err.what());
+        ::exit(EXIT_FAILURE);
+    } catch (const std::exception &err) {
+        ERROR("%s: %s, exiting\n", err.what());
+        ::exit(EXIT_FAILURE);
+    }
 }