=== modified file 'README'
--- README	2009-02-23 11:52:42 +0000
+++ README	2009-11-03 00:12:35 +0000
@@ -99,7 +99,7 @@
    Multiple Mandos servers can coexist on a network without any
    trouble.  They do not clash, and clients will try all available
    servers.  This means that if just one reboots then the other can
-   bring it back up, but if both reboots at the same time they will
+   bring it back up, but if both reboot at the same time they will
    stay down until someone types in the password on one of them.
 
 ** Faking ping replies?

=== modified file 'mandos'
--- mandos	2009-11-02 05:52:57 +0000
+++ mandos	2009-11-03 00:12:35 +0000
@@ -1716,6 +1716,7 @@
             service.activate()
         except dbus.exceptions.DBusException, error:
             logger.critical(u"DBusException: %s", error)
+            cleanup()
             sys.exit(1)
         # End of Avahi example code
         
@@ -1728,12 +1729,15 @@
         main_loop.run()
     except AvahiError, error:
         logger.critical(u"AvahiError: %s", error)
+        cleanup()
         sys.exit(1)
     except KeyboardInterrupt:
         if debug:
             print >> sys.stderr
         logger.debug(u"Server received KeyboardInterrupt")
     logger.debug(u"Server exiting")
+    # Must run before the D-Bus bus name gets deregistered
+    cleanup()
 
 if __name__ == '__main__':
     main()