diff --git a/server/etcdserver/server.go b/server/etcdserver/server.go
index 4c068c11a..32e1e280f 100644
--- a/server/etcdserver/server.go
+++ b/server/etcdserver/server.go
@@ -393,7 +393,7 @@ func NewServer(cfg config.ServerConfig) (srv *EtcdServer, err error) {
 	}
 
 	defer func() {
-		if err != nil {
+		if be != nil && err != nil {
 			be.Close()
 		}
 	}()