diff --git a/util/unixchild/unixchild.go b/util/unixchild/unixchild.go
index b417187..91930c0 100644
--- a/util/unixchild/unixchild.go
+++ b/util/unixchild/unixchild.go
@@ -219,6 +219,7 @@
 
 	select {
 	case <-c.stopped:
+		c.deleteSocket()
 		c.state = CLIENT_STATE_STOPPED
 		log.Debugf("Stopped client")
 		return
@@ -246,6 +247,7 @@
 
 	l, err := net.Listen("unix", c.sockPath)
 	if err != nil {
+		c.deleteSocket()
 		return err
 	}