Index: src/Extensions/Banshee.Daap/Daap/ServiceLocator.cs
===================================================================
--- src/Extensions/Banshee.Daap/Daap/ServiceLocator.cs	(revision 4316)
+++ src/Extensions/Banshee.Daap/Daap/ServiceLocator.cs	(working copy)
@@ -116,8 +116,10 @@
         }
         
         public void Stop () {
-            browser.Dispose ();
-            browser = null;
+            if (browser != null) {
+                browser.Dispose ();
+                browser = null;
+            }
             services.Clear ();
         }
         
