diff --git a/ChangeLog b/ChangeLog
index d6a5d62..5eacbcc 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-04-04  Aaron Bockover  <aaron@aaronbock.net>
+
+	* src/Server.cs (UnregisterService): handle exception when trying to
+	shutdown the service locator
+
 2006-03-12  James Willcox  <snorp@snorp.net>
 
 	* src/Database.cs: fix DownloadSong()
diff --git a/src/Server.cs b/src/Server.cs
index be55281..5e3179b 100644
--- a/src/Server.cs
+++ b/src/Server.cs
@@ -568,7 +568,10 @@ namespace DAAP {
                     return;
                 }
                 
-                zc_service.Dispose ();
+                try {
+                    zc_service.Dispose ();
+                } catch {
+                }
                 zc_service = null;
             }
         }