=== modified file 'mandos'
--- mandos	2015-05-23 12:07:07 +0000
+++ mandos	2015-05-30 16:47:00 +0000
@@ -2575,7 +2575,7 @@
             old_bus_name = dbus.service.BusName(
                 "se.bsnet.fukt.Mandos", bus,
                 do_not_queue=True)
-        except dbus.exceptions.NameExistsException as e:
+        except dbus.exceptions.DBusException as e:
             logger.error("Disabling D-Bus:", exc_info=e)
             use_dbus = False
             server_settings["use_dbus"] = False