diff --git a/lib/telemetry_metrics_statsd.ex b/lib/telemetry_metrics_statsd.ex
index 91b2815..4502d58 100644
--- a/lib/telemetry_metrics_statsd.ex
+++ b/lib/telemetry_metrics_statsd.ex
@@ -596,7 +596,7 @@ defmodule TelemetryMetricsStatsd do
       case item do
         {:udp_worker, udp_worker} ->
           :telemetry.execute(
-            [:telemetry_metrics_statsd, :udp_worker_metrics],
+            [:telemetry_metrics_statsd, :udp_metrics],
             %{
               message_queue_len: message_queue_len(udp_worker),
             },
@@ -611,6 +611,11 @@ defmodule TelemetryMetricsStatsd do
     schedule_metrics_report(state.diagnostic_metrics_report_interval)
 
     {:noreply, state}
+  rescue
+    _ ->
+      Logger.error("Failed to report diagnostic metrics")
+
+      {:noreply, state}
   end
 
   @impl true
diff --git a/test/telemetry_metrics_statsd_test.exs b/test/telemetry_metrics_statsd_test.exs
index 1d73337..9195611 100644
--- a/test/telemetry_metrics_statsd_test.exs
+++ b/test/telemetry_metrics_statsd_test.exs
@@ -853,7 +853,7 @@ defmodule TelemetryMetricsStatsdTest do
                        %{}, _}}
 
       assert_receive {:telemetry_event,
-                      {[:telemetry_metrics_statsd, :udp_worker_metrics], %{message_queue_len: 0},
+                      {[:telemetry_metrics_statsd, :udp_metrics], %{message_queue_len: 0},
                        %{}, _}}
     end
   end