diff --git a/etcd.go b/etcd.go
index c43178d72..110c4185d 100644
--- a/etcd.go
+++ b/etcd.go
@@ -203,8 +203,7 @@ func startRaft(securityType int) {
 	raftServer, err = raft.NewServer(raftName, dirPath, raftTransporter, etcdStore, nil)
 
 	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+		fatal(fmt.Sprintln(err))
 	}
 
 	// LoadSnapshot
@@ -398,8 +397,7 @@ func startClientTransport(port int, st int) {
 		err := server.ListenAndServeTLS(clientCertFile, clientKeyFile)
 
 		if err != nil {
-			log.Fatal(err)
-			os.Exit(1)
+			fatal(fmt.Sprintln(err))
 		}
 	}
 }
@@ -522,8 +520,7 @@ func createCertPool(CAFile string) *x509.CertPool {
 	cert, err := x509.ParseCertificate(block.Bytes)
 
 	if err != nil {
-		fmt.Println(err)
-		os.Exit(1)
+		fatal(fmt.Sprintln(err))
 	}
 
 	certPool := x509.NewCertPool()