diff --git a/staging/vhost-device-sound/src/audio_backends/alsa.rs b/staging/vhost-device-sound/src/audio_backends/alsa.rs
index 8e78d24..410972e 100644
--- a/staging/vhost-device-sound/src/audio_backends/alsa.rs
+++ b/staging/vhost-device-sound/src/audio_backends/alsa.rs
@@ -645,12 +645,14 @@ impl AudioBackend for AlsaBackend {
     }
 
     fn stop(&self, id: u32) -> CrateResult<()> {
-        if let Some(Err(err)) = self
+        if let Err(err) = self
             .streams
             .write()
             .unwrap()
             .get_mut(id as usize)
-            .map(|s| s.state.stop())
+            .ok_or_else(|| Error::StreamWithIdNotFound(id))?
+            .state
+            .stop()
         {
             log::error!("Stream {} stop {}", id, err);
         }