diff --git a/etcdserver/server.go b/etcdserver/server.go
index c044e3d44..4c67d0dfd 100644
--- a/etcdserver/server.go
+++ b/etcdserver/server.go
@@ -341,7 +341,7 @@ func NewServer(cfg ServerConfig) (srv *EtcdServer, err error) {
 	be := openBackend(cfg)
 
 	defer func() {
-		if err != nil {
+		if be != nil && err != nil {
 			be.Close()
 		}
 	}()