diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index e60e841e1..4259bc3d8 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -31,8 +31,8 @@ jobs:
       - run: make test
       - if: ${{ always() }}
         run: |
-          go get -u github.com/vakenbolt/go-test-report
-          cat tests.json | go-test-report
+          go install github.com/vakenbolt/go-test-report@latest
+          cat tests.json | $(go env GOPATH)/bin/go-test-report
       - if: ${{ always() }}
         uses: actions/upload-artifact@v3
         with:
diff --git a/pkg/roles/dns/zone.go b/pkg/roles/dns/zone.go
index 9c334f50c..99ef1ee9c 100644
--- a/pkg/roles/dns/zone.go
+++ b/pkg/roles/dns/zone.go
@@ -242,7 +242,7 @@ func (z *Zone) watchZoneRecords(ctx context.Context) {
 }
 
 func (z *Zone) StopWatchingRecords() {
-	if z.recordsWatchCtx != nil {
+	if z != nil && z.recordsWatchCtx != nil {
 		z.recordsWatchCtx()
 	}
 }