diff --git a/rust/bt-bass/src/types.rs b/rust/bt-bass/src/types.rs
index a3d1222..b881328 100644
--- a/rust/bt-bass/src/types.rs
+++ b/rust/bt-bass/src/types.rs
@@ -87,7 +87,7 @@
     fn decode(buf: &[u8]) -> (core::result::Result<Self, Self::Error>, usize) {
         const BYTE_SIZE: usize = ControlPointOpcode::BYTE_SIZE;
         if buf.len() < BYTE_SIZE {
-            return (Err(PacketError::BufferTooSmall), buf.len());
+            return (Err(PacketError::UnexpectedDataLength), buf.len());
         }
         (Self::check_opcode(buf[0]).map(|_| RemoteScanStoppedOperation), BYTE_SIZE)
     }
@@ -1148,6 +1148,10 @@
         let (decoded, len) = RemoteScanStoppedOperation::decode(&bytes);
         assert_eq!(decoded, Ok(stopped));
         assert_eq!(len, 1);
+        assert_eq!(
+            RemoteScanStoppedOperation::decode(&[]).0,
+            Err(PacketError::UnexpectedDataLength)
+        );
     }
 
     #[test]