=== modified file 'mandos'
--- mandos	2015-10-24 17:48:13 +0000
+++ mandos	2016-02-06 14:54:50 +0000
@@ -3064,7 +3064,8 @@
             # Don't signal the disabling
             client.disable(quiet=True)
             # Emit D-Bus signal for removal
-            mandos_dbus_service.client_removed_signal(client)
+            if use_dbus:
+                mandos_dbus_service.client_removed_signal(client)
         client_settings.clear()
     
     atexit.register(cleanup)