diff --git a/src/main.rs b/src/main.rs
index 56324bd..6c22a0e 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -143,7 +143,10 @@ async fn route_metrics(
     let mut out = String::new();
 
     for bad in trafficdata {
-        out.push_str(&format!("berlinerbaeder_occupation{{bad=\"{}\" badname=\"{}\"}} {}\n", bad.id, state.baedernames.get(&bad.id).unwrap_or(&String::new()), bad.counter.unwrap_or(-1)));
+        match state.baedernames.get(&bad.id) {
+            Some(name) => out.push_str(&format!("berlinerbaeder_occupation{{bad=\"{}\", badname=\"{}\"}} {}\n", bad.id, name, bad.counter.unwrap_or(-1))),
+            None => out.push_str(&format!("berlinerbaeder_occupation{{bad=\"{}\"}} {}\n", bad.id, bad.counter.unwrap_or(-1))),
+        };
     }
 
     return Ok(out);