diff --git a/cmd/etcd.go b/cmd/etcd.go
index 35171de7..cd2b35e6 100644
--- a/cmd/etcd.go
+++ b/cmd/etcd.go
@@ -213,8 +213,9 @@ func validateCerts(state cluster.State) error {
 		if _, err := cert.Verify(x509.VerifyOptions{Roots: certPool, KeyUsages: []x509.ExtKeyUsage{x509.ExtKeyUsageClientAuth}}); err != nil {
 			if failedErrs == nil {
 				failedErrs = fmt.Errorf("Certificate [%s] failed verification: %v", certPKI.Name, err)
+			} else {
+				failedErrs = errors.Wrap(failedErrs, fmt.Sprintf("Certificate [%s] failed verification: %v", certPKI.Name, err))
 			}
-			failedErrs = errors.Wrap(failedErrs, fmt.Sprintf("Certificate [%s] failed verification: %v", certPKI.Name, err))
 		}
 	}
 	if failedErrs != nil {