diff --git a/kvs/raft_server.go b/kvs/raft_server.go
index 8b589e9..8727b1e 100644
--- a/kvs/raft_server.go
+++ b/kvs/raft_server.go
@@ -278,16 +278,16 @@ func (s *RaftServer) Join(node *ceteraft.Node) error {
 		}
 
 		client, err := NewGRPCClient(string(node.GrpcAddr))
+		if err != nil {
+			s.logger.Printf("[ERR] %v", err)
+			return err
+		}
 		defer func() {
 			err := client.Close()
 			if err != nil {
 				s.logger.Printf("[ERR] %v", err)
 			}
 		}()
-		if err != nil {
-			s.logger.Printf("[ERR] %v", err)
-			return nil
-		}
 
 		err = client.Join(node)
 		if err != nil {
@@ -343,16 +343,16 @@ func (s *RaftServer) Leave(node *ceteraft.Node) error {
 		}
 
 		client, err := NewGRPCClient(string(node.GrpcAddr))
+		if err != nil {
+			s.logger.Printf("[ERR] %v", err)
+			return err
+		}
 		defer func() {
 			err := client.Close()
 			if err != nil {
 				s.logger.Printf("[ERR] %v", err)
 			}
 		}()
-		if err != nil {
-			s.logger.Printf("[ERR] %v", err)
-			return nil
-		}
 
 		err = client.Leave(node)
 		if err != nil {
@@ -502,16 +502,16 @@ func (s *RaftServer) Set(kvp *kvs.KeyValuePair) error {
 		}
 
 		client, err := NewGRPCClient(string(node.GrpcAddr))
+		if err != nil {
+			s.logger.Printf("[ERR] %v", err)
+			return err
+		}
 		defer func() {
 			err := client.Close()
 			if err != nil {
 				s.logger.Printf("[ERR] %v", err)
 			}
 		}()
-		if err != nil {
-			s.logger.Printf("[ERR] %v", err)
-			return err
-		}
 
 		err = client.Put(kvp)
 		if err != nil {
@@ -563,16 +563,16 @@ func (s *RaftServer) Delete(kvp *kvs.KeyValuePair) error {
 		}
 
 		client, err := NewGRPCClient(string(node.GrpcAddr))
+		if err != nil {
+			s.logger.Printf("[ERR] %v", err)
+			return err
+		}
 		defer func() {
 			err := client.Close()
 			if err != nil {
 				s.logger.Printf("[ERR] %v", err)
 			}
 		}()
-		if err != nil {
-			s.logger.Printf("[ERR] %v", err)
-			return err
-		}
 
 		err = client.Delete(kvp)
 		if err != nil {
diff --git a/kvs/server.go b/kvs/server.go
index 951e5c7..8c05990 100644
--- a/kvs/server.go
+++ b/kvs/server.go
@@ -123,16 +123,16 @@ func (s *Server) Start() {
 	if !s.bootstrap {
 		// create gRPC client
 		client, err := NewGRPCClient(s.joinAddr)
+		if err != nil {
+			s.logger.Printf("[ERR] %v", err)
+			return
+		}
 		defer func() {
 			err := client.Close()
 			if err != nil {
 				s.logger.Printf("[ERR] %v", err)
 			}
 		}()
-		if err != nil {
-			s.logger.Printf("[ERR] %v", err)
-			return
-		}
 
 		// join to the existing cluster
 		err = client.Join(s.node)