Upgrade to 0.12

[github/fretlink/terraform-provider-statuscake.git] / vendor / github.com / hashicorp / go-multierror / append.go

diff --git a/vendor/github.com/hashicorp/go-multierror/append.go b/vendor/github.com/hashicorp/go-multierror/append.go
index 00afa9b35162cf68b67a55b4c7e52220e63eeecf..775b6e753e77bc610c91f94b61e4c4a411d1a6ff 100644 (file)
--- a/vendor/github.com/hashicorp/go-multierror/append.go
+++ b/vendor/github.com/hashicorp/go-multierror/append.go
@@ -18,9 +18,13 @@ func Append(err error, errs ...error) *Error {
                for _, e := range errs {
                        switch e := e.(type) {
                        case *Error:
-                               err.Errors = append(err.Errors, e.Errors...)
+                               if e != nil {
+                                       err.Errors = append(err.Errors, e.Errors...)
+                               }
                        default:
-                               err.Errors = append(err.Errors, e)
+                               if e != nil {
+                                       err.Errors = append(err.Errors, e)
+                               }
                        }
                }