diff --git a/AT5/cmd/at5/at5.go b/AT5/cmd/at5/at5.go
index 38a2bd7..6feb3fe 100644
--- a/AT5/cmd/at5/at5.go
+++ b/AT5/cmd/at5/at5.go
@@ -23,6 +23,7 @@ type ItemT struct {
 	PubDate  string `xml:"pubDate"`
 	UnixTime int64  `xml:"unixTime"`
 	Guid     string `xml:"guid"`
+	Link     string `xml:"link"`
 	Data     []byte `xml:",innerxml"`
 }
 
@@ -90,7 +91,8 @@ func main() {
 			var ok bool
 			defer func() {
 				if e.Panicked {
-					fmt.Fprintln(os.Stderr, "----", filename, "----")
+					fmt.Fprintln(os.Stderr, "----", filename)
+					fmt.Fprintln(os.Stderr, "----", item.Link)
 				}
 				if !ok {
 					_ = os.Remove(filename + ".xml")
diff --git a/GG/cmd/gg/gg.go b/GG/cmd/gg/gg.go
index f711775..37bb77c 100644
--- a/GG/cmd/gg/gg.go
+++ b/GG/cmd/gg/gg.go
@@ -108,7 +108,8 @@ func main() {
 			var ok bool
 			defer func() {
 				if e.Panicked {
-					fmt.Fprintln(os.Stderr, "----", filename, "----")
+					fmt.Fprintln(os.Stderr, "----", filename)
+					fmt.Fprintln(os.Stderr, "----", item.Link)
 				}
 				if !ok {
 					_ = os.Remove(filename + ".xml")
diff --git a/NOS/cmd/nos/nos.go b/NOS/cmd/nos/nos.go
index 1ad228e..f82d528 100644
--- a/NOS/cmd/nos/nos.go
+++ b/NOS/cmd/nos/nos.go
@@ -107,7 +107,8 @@ func main() {
 			var ok bool
 			defer func() {
 				if e.Panicked {
-					fmt.Fprintln(os.Stderr, "----", filename, "----")
+					fmt.Fprintln(os.Stderr, "----", filename)
+					fmt.Fprintln(os.Stderr, "----", item.Link)
 				}
 				if !ok {
 					_ = os.Remove(filename + ".xml")
diff --git a/NU/cmd/nu/nu.go b/NU/cmd/nu/nu.go
index 5dd5960..c864861 100644
--- a/NU/cmd/nu/nu.go
+++ b/NU/cmd/nu/nu.go
@@ -112,7 +112,8 @@ func main() {
 			var ok bool
 			defer func() {
 				if e.Panicked {
-					fmt.Fprintln(os.Stderr, "----", filename, "----")
+					fmt.Fprintln(os.Stderr, "----", filename)
+					fmt.Fprintln(os.Stderr, "----", item.Link)
 				}
 				if !ok {
 					_ = os.Remove(filename + ".xml")
diff --git a/NieuwsNL/cmd/nieuwsnl/nieuwsnl.go b/NieuwsNL/cmd/nieuwsnl/nieuwsnl.go
index 3db5d4a..6e59336 100644
--- a/NieuwsNL/cmd/nieuwsnl/nieuwsnl.go
+++ b/NieuwsNL/cmd/nieuwsnl/nieuwsnl.go
@@ -107,7 +107,8 @@ func main() {
 			var ok bool
 			defer func() {
 				if e.Panicked {
-					fmt.Fprintln(os.Stderr, "----", filename, "----")
+					fmt.Fprintln(os.Stderr, "----", filename)
+					fmt.Fprintln(os.Stderr, "----", item.Link)
 				}
 				if !ok {
 					_ = os.Remove(filename + ".xml")
diff --git a/RO/cmd/ro/ro.go b/RO/cmd/ro/ro.go
index 9bcbdf4..7ec983a 100644
--- a/RO/cmd/ro/ro.go
+++ b/RO/cmd/ro/ro.go
@@ -23,6 +23,7 @@ type ItemT struct {
 	PubDate  string `xml:"pubDate"`
 	UnixTime int64  `xml:"unixTime"`
 	Guid     string `xml:"guid"`
+	Link     string `xml:"link"`
 	Data     []byte `xml:",innerxml"`
 }
 
@@ -90,7 +91,8 @@ func main() {
 			var ok bool
 			defer func() {
 				if e.Panicked {
-					fmt.Fprintln(os.Stderr, "----", filename, "----")
+					fmt.Fprintln(os.Stderr, "----", filename)
+					fmt.Fprintln(os.Stderr, "----", item.Link)
 				}
 				if !ok {
 					_ = os.Remove(filename + ".xml")
diff --git a/Sargasso/cmd/sargasso/sargasso.go b/Sargasso/cmd/sargasso/sargasso.go
index 39a4d31..23dfb3b 100644
--- a/Sargasso/cmd/sargasso/sargasso.go
+++ b/Sargasso/cmd/sargasso/sargasso.go
@@ -23,6 +23,7 @@ type ItemT struct {
 	PubDate  string `xml:"pubDate"`
 	UnixTime int64  `xml:"unixTime"`
 	Guid     string `xml:"guid"`
+	Link     string `xml:"link"`
 	Data     []byte `xml:",innerxml"`
 }
 
@@ -90,7 +91,8 @@ func main() {
 			var ok bool
 			defer func() {
 				if e.Panicked {
-					fmt.Fprintln(os.Stderr, "----", filename, "----")
+					fmt.Fprintln(os.Stderr, "----", filename)
+					fmt.Fprintln(os.Stderr, "----", item.Link)
 				}
 				if !ok {
 					_ = os.Remove(filename + ".xml")
diff --git a/Sikkom/cmd/sikkom/sikkom.go b/Sikkom/cmd/sikkom/sikkom.go
index 0cdbdf5..77f2924 100644
--- a/Sikkom/cmd/sikkom/sikkom.go
+++ b/Sikkom/cmd/sikkom/sikkom.go
@@ -102,7 +102,8 @@ func main() {
 			var ok bool
 			defer func() {
 				if e.Panicked {
-					fmt.Fprintln(os.Stderr, "----", filename, "----")
+					fmt.Fprintln(os.Stderr, "----", filename)
+					fmt.Fprintln(os.Stderr, "----", item.Link)
 				}
 				if !ok {
 					_ = os.Remove(filename + ".xml")
diff --git a/Tzum/cmd/tzum/tzum.go b/Tzum/cmd/tzum/tzum.go
index 6ced178..337759c 100644
--- a/Tzum/cmd/tzum/tzum.go
+++ b/Tzum/cmd/tzum/tzum.go
@@ -23,6 +23,7 @@ type ItemT struct {
 	PubDate  string `xml:"pubDate"`
 	UnixTime int64  `xml:"unixTime"`
 	Guid     string `xml:"guid"`
+	Link     string `xml:"link"`
 	Data     []byte `xml:",innerxml"`
 }
 
@@ -90,7 +91,8 @@ func main() {
 			var ok bool
 			defer func() {
 				if e.Panicked {
-					fmt.Fprintln(os.Stderr, "----", filename, "----")
+					fmt.Fprintln(os.Stderr, "----", filename)
+					fmt.Fprintln(os.Stderr, "----", item.Link)
 				}
 				if !ok {
 					_ = os.Remove(filename + ".xml")
diff --git a/VRT/cmd/vrt/vrt.go b/VRT/cmd/vrt/vrt.go
index 42c4001..6482ae2 100644
--- a/VRT/cmd/vrt/vrt.go
+++ b/VRT/cmd/vrt/vrt.go
@@ -121,10 +121,17 @@ func main() {
 
 		p(os.MkdirAll(dirname, 0777))
 		func() {
+			var link string
+			for _, l := range item.Link {
+				if l.Type == "text/html" {
+					link = l.Href
+				}
+			}
 			var ok bool
 			defer func() {
 				if e.Panicked {
-					fmt.Fprintln(os.Stderr, "----", filename, "----")
+					fmt.Fprintln(os.Stderr, "----", filename)
+					fmt.Fprintln(os.Stderr, "----", link)
 				}
 				if !ok {
 					_ = os.Remove(filename + ".xml")
@@ -139,12 +146,6 @@ func main() {
 			p(fp.Close())
 			p(os.Chtimes(filename+".xml", t, t))
 
-			var link string
-			for _, l := range item.Link {
-				if l.Type == "text/html" {
-					link = l.Href
-				}
-			}
 			ok = doArticle(filename, link, item.Title.Text, item.Nstag, item.Nslabeltag, t, needUpdate)
 		}()
 	}