diff --git a/etcd.go b/etcd.go
index 2bebf691..94d94306 100644
--- a/etcd.go
+++ b/etcd.go
@@ -399,7 +399,9 @@ func (obj *EmbdEtcd) Destroy() error {
 	obj.exitchan <- struct{}{} // cause main loop to exit
 
 	obj.rLock.Lock()
-	obj.client.Close()
+	if obj.client != nil {
+		obj.client.Close()
+	}
 	obj.client = nil
 	obj.rLock.Unlock()