diff --git a/vm-device/src/bus.rs b/vm-device/src/bus.rs
index 20e5d3e8f..c9240d134 100644
--- a/vm-device/src/bus.rs
+++ b/vm-device/src/bus.rs
@@ -112,7 +112,7 @@ impl Bus {
             .range(..=BusRange { base: addr, len: 1 })
             .rev()
             .next()?;
-        Some((*range, dev.upgrade().unwrap().clone()))
+        dev.upgrade().map(|d| (*range, d.clone()))
     }
 
     #[allow(clippy::type_complexity)]