diff --git a/daemon/src/client/android/client.cpp b/daemon/src/client/android/client.cpp
index 04979e8bf970e07ba4b18a9dcd3c8a0d678a2b32..5df2630a2101bdf7adb456329271bcaa120c53da 100644
--- a/daemon/src/client/android/client.cpp
+++ b/daemon/src/client/android/client.cpp
@@ -32,57 +32,21 @@
 #include "config.h"
 #endif
 
-#include <cstdlib>
 #include "client/client.h"
-#include "global.h"
-#include "manager.h"
-#include "logger.h"
-#include "instance-glue.h"
-
-
-
 #include "client/callmanager.h"
 #include "client/configurationmanager.h"
 
-#if HAVE_DBUS
-#include "client/networkmanager.h"
-#endif
-
-#ifdef SFL_VIDEO
-#include "video_controls.h"
-#endif
-
-Client::Client() : callManager_(0)
-    , configurationManager_(0)
+Client::Client() : callManager_(new CallManager)
+    , configurationManager_(new ConfigurationManager)
+    , instanceManager_(0)
+    , dispatcher_(0)
 #ifdef SFL_VIDEO
     , videoControls_(0)
 #endif
 #ifdef USE_NETWORKMANAGER
     , networkManager_(0)
 #endif
-{
-    try {
-
-        callManager_ = new CallManager();
-        configurationManager_ = new ConfigurationManager();
-
-#ifdef SFL_VIDEO
-        videoControls_ = new VideoControls(sessionConnection);
-#endif
-
-#ifdef USE_NETWORKMANAGER
-        DEBUG("DBUS system connection to system bus");
-        DBus::Connection systemConnection(DBus::Connection::SystemBus());
-        DEBUG("DBUS create the network manager from the system bus");
-        networkManager_ = new NetworkManager(systemConnection, "/org/freedesktop/NetworkManager", "");
-#endif
-
-    } catch (const DBus::Error &err) {
-        ERROR("%s: %s, exiting\n", err.name(), err.what());
-        ::exit(EXIT_FAILURE);
-    }
-
-}
+{}
 
 Client::~Client()
 {
@@ -92,34 +56,14 @@ Client::~Client()
 #ifdef SFL_VIDEO
     delete videoControls_;
 #endif
+    delete dispatcher_;
     delete instanceManager_;
     delete configurationManager_;
     delete callManager_;
-    delete dispatcher_;
 }
 
 void Client::event_loop()
-{
-    try {
-        dispatcher_->enter();
-    } catch (const DBus::Error &err) {
-        ERROR("%s: %s, quitting\n", err.name(), err.what());
-        return;
-    } catch (const std::exception &err) {
-        ERROR("%s: quitting\n", err.what());
-        return;
-    }
-}
+{}
 
 void Client::exit()
-{
-    try {
-        dispatcher_->leave();
-    } catch (const DBus::Error &err) {
-        ERROR("%s: %s, quitting\n", err.name(), err.what());
-        return;
-    } catch (const std::exception &err) {
-        ERROR("%s: quitting\n", err.what());
-        return;
-    }
-}
+{}
diff --git a/daemon/src/client/dbus/Makefile.am b/daemon/src/client/dbus/Makefile.am
index 67752d0311c8df0746754f82a5d4d91dda4f9fe6..04edb76ac8d0c0e6414036473ccc6701e2e5ff84 100644
--- a/daemon/src/client/dbus/Makefile.am
+++ b/daemon/src/client/dbus/Makefile.am
@@ -9,20 +9,20 @@ BUILT_SOURCES=                      \
 
 if SFL_VIDEO
 BUILT_SOURCES+=video_controls-glue.h
-video_controls-glue.h: ../video_controls-introspec.xml Makefile.am
+video_controls-glue.h: video_controls-introspec.xml Makefile.am
 	dbusxx-xml2cpp $< --adaptor=$@
 endif
 
 # Rule to generate the binding headers
-callmanager-glue.h: ../callmanager-introspec.xml Makefile.am
+callmanager-glue.h: callmanager-introspec.xml Makefile.am
 	dbusxx-xml2cpp $< --adaptor=$@
 
 # Rule to generate the binding headers
-configurationmanager-glue.h: ../configurationmanager-introspec.xml Makefile.am
+configurationmanager-glue.h: configurationmanager-introspec.xml Makefile.am
 	dbusxx-xml2cpp $< --adaptor=$@
 
 # Rule to generate the binding headers
-instance-glue.h: ../instance-introspec.xml Makefile.am
+instance-glue.h: instance-introspec.xml Makefile.am
 	dbusxx-xml2cpp $< --adaptor=$@
 
 libclient_la_SOURCES = \
@@ -72,13 +72,13 @@ $(service_DATA): $(service_in_files) Makefile
 	sed -e "s|libexec|$(libdir)/sflphone|" $<> $@
 
 EXTRA_DIST = README $(service_in_files) \
-			 ../callmanager-introspec.xml \
-			 ../configurationmanager-introspec.xml \
-			 ../instance-introspec.xml \
-			 ../org.freedesktop.NetworkManager.xml
+			 callmanager-introspec.xml \
+			 configurationmanager-introspec.xml \
+			 instance-introspec.xml \
+			 org.freedesktop.NetworkManager.xml
 
 if SFL_VIDEO
-EXTRA_DIST += ../video_controls-introspec.xml
+EXTRA_DIST += video_controls-introspec.xml
 endif
 
 CLEANFILES= \
diff --git a/daemon/src/client/callmanager-introspec.xml b/daemon/src/client/dbus/callmanager-introspec.xml
similarity index 100%
rename from daemon/src/client/callmanager-introspec.xml
rename to daemon/src/client/dbus/callmanager-introspec.xml
diff --git a/daemon/src/client/configurationmanager-introspec.xml b/daemon/src/client/dbus/configurationmanager-introspec.xml
similarity index 100%
rename from daemon/src/client/configurationmanager-introspec.xml
rename to daemon/src/client/dbus/configurationmanager-introspec.xml
diff --git a/daemon/src/client/instance-introspec.xml b/daemon/src/client/dbus/instance-introspec.xml
similarity index 100%
rename from daemon/src/client/instance-introspec.xml
rename to daemon/src/client/dbus/instance-introspec.xml
diff --git a/daemon/src/client/org.freedesktop.NetworkManager.xml b/daemon/src/client/dbus/org.freedesktop.NetworkManager.xml
similarity index 100%
rename from daemon/src/client/org.freedesktop.NetworkManager.xml
rename to daemon/src/client/dbus/org.freedesktop.NetworkManager.xml
diff --git a/daemon/src/client/video_controls-introspec.xml b/daemon/src/client/dbus/video_controls-introspec.xml
similarity index 100%
rename from daemon/src/client/video_controls-introspec.xml
rename to daemon/src/client/dbus/video_controls-introspec.xml