diff --git a/oz-daemon/client.go b/oz-daemon/client.go
index 3df665a..e2cbef2 100644
--- a/oz-daemon/client.go
+++ b/oz-daemon/client.go
@@ -19,13 +19,14 @@ func clientSend(msg interface{}) (*ipc.Message, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer c.Close()
 	rr, err := c.ExchangeMsg(msg)
-	resp := <- rr.Chan()
-	rr.Done()
-	c.Close()
 	if err != nil {
 		return nil, err
 	}
+
+	resp := <- rr.Chan()
+	rr.Done()
 	return resp,nil
 }
 
diff --git a/oz-init/client.go b/oz-init/client.go
index 5c6dc0f..90d6541 100644
--- a/oz-init/client.go
+++ b/oz-init/client.go
@@ -18,14 +18,14 @@ func clientSend(addr string, msg interface{}) (*ipc.Message, error) {
 	if err != nil {
 		return nil, err
 	}
+	defer c.Close()
 	rr, err := c.ExchangeMsg(msg)
-	resp := <- rr.Chan()
-	rr.Done()
-
-	c.Close()
 	if err != nil {
 		return nil, err
 	}
+
+	resp := <- rr.Chan()
+	rr.Done()
 	return resp, nil
 }