1 files changed, 3 insertions, 1 deletions
diff --git a/sugar-network b/sugar-network
index ad70db2..078d2ab 100755
--- a/sugar-network
+++ b/sugar-network
@@ -120,9 +120,11 @@ class Application(application.Application):
             result = IPCClient().call(request, response)
 
         finally:
-            if pid_path:
+            if server is not None:
                 server.close()
+            if mountset is not None:
                 mountset.close()
+            if pid_path:
                 os.unlink(pid_path)
 
         if result: