diff --git a/metric/metric.go b/metric/metric.go
index 0dbc1fa85d153..db105982d3f8d 100644
--- a/metric/metric.go
+++ b/metric/metric.go
@@ -269,6 +269,12 @@ func (m *metric) Split(maxSize int) []telegraf.Metric {
 }
 
 func (m *metric) Fields() map[string]interface{} {
+	defer func() {
+		if r := recover(); r != nil {
+			panic(fmt.Sprintf("Recovered in metric.Fields(); m.fields: %q\n", m.fields))
+		}
+	}()
+
 	fieldMap := map[string]interface{}{}
 	i := 0
 	for {