3 files changed, 3 insertions, 2 deletions
diff --git a/plugin/clouddns/clouddns.go b/plugin/clouddns/clouddns.go
index 4556ecac6..e09c247be 100644
--- a/plugin/clouddns/clouddns.go
+++ b/plugin/clouddns/clouddns.go
@@ -204,7 +204,6 @@ func (h *CloudDNS) updateZones(ctx context.Context) error {
 				(*z[i]).z = newZ
 				h.zMu.Unlock()
 			}
-
 		}(zName, z)
 	}
 	// Collect errors (if any). This will also sync on all zones updates
diff --git a/plugin/clouddns/clouddns_test.go b/plugin/clouddns/clouddns_test.go
index f394f0593..e052bf256 100644
--- a/plugin/clouddns/clouddns_test.go
+++ b/plugin/clouddns/clouddns_test.go
@@ -152,7 +152,6 @@ func TestCloudDNS(t *testing.T) {
 
 			m.Authoritative = true
 			rcode = dns.RcodeSuccess
-
 		}
 
 		m.SetRcode(r, rcode)
diff --git a/plugin/clouddns/setup.go b/plugin/clouddns/setup.go
index 507ae278e..cfd7eecd6 100644
--- a/plugin/clouddns/setup.go
+++ b/plugin/clouddns/setup.go
@@ -81,16 +81,19 @@ func setup(c *caddy.Controller) error {
 		ctx, cancel := context.WithCancel(context.Background())
 		client, err := f(ctx, opt)
 		if err != nil {
+			cancel()
 			return err
 		}
 
 		h, err := New(ctx, client, keys, up)
 		if err != nil {
+			cancel()
 			return plugin.Error("clouddns", c.Errf("failed to create plugin: %v", err))
 		}
 		h.Fall = fall
 
 		if err := h.Run(ctx); err != nil {
+			cancel()
 			return plugin.Error("clouddns", c.Errf("failed to initialize plugin: %v", err))
 		}