diff --git a/bumble/att.py b/bumble/att.py
index 49c3130..688321b 100644
--- a/bumble/att.py
+++ b/bumble/att.py
@@ -42,7 +42,7 @@ from typing_extensions import TypeIs
 
 from bumble import hci, l2cap, utils
 from bumble.colors import color
-from bumble.core import UUID, InvalidOperationError, ProtocolError
+from bumble.core import UUID, InvalidOperationError, InvalidPacketError, ProtocolError
 from bumble.hci import HCI_Object
 
 # -----------------------------------------------------------------------------
@@ -250,7 +250,7 @@ class ATT_PDU:
     @classmethod
     def from_bytes(cls, pdu: bytes) -> ATT_PDU:
         if not pdu:
-            raise ValueError("Empty ATT PDU")
+            raise InvalidPacketError("Empty ATT PDU")
         op_code = pdu[0]
 
         subclass = ATT_PDU.pdu_classes.get(op_code)
diff --git a/bumble/hfp.py b/bumble/hfp.py
index 6b8fbb0..7a782e7 100644
--- a/bumble/hfp.py
+++ b/bumble/hfp.py
@@ -68,6 +68,8 @@ class HfpProtocolError(ProtocolError):
 
 # -----------------------------------------------------------------------------
 class HfpProtocol:
+    MAX_BUFFER_SIZE: ClassVar[int] = 65536
+
     dlc: rfcomm.DLC
     buffer: str
     lines: collections.deque
@@ -88,11 +90,17 @@ class HfpProtocol:
 
         logger.debug(f'<<< Data received: {data}')
 
+        # Drop incoming data if it would overflow the buffer; keep existing
+        # partial packet state intact so a future clean packet can still parse.
+        if len(self.buffer) + len(data) > self.MAX_BUFFER_SIZE:
+            logger.warning(
+                'HFP buffer overflow (>%d bytes), dropping incoming data',
+                self.MAX_BUFFER_SIZE,
+            )
+            return
+
         # Add to the buffer and look for lines
         self.buffer += data
-        if len(self.buffer) > 65536:
-            logger.warning("HFP buffer overflow, truncating")
-            self.buffer = self.buffer[-65536:]
         while (separator := self.buffer.find('\r')) >= 0:
             line = self.buffer[:separator].strip()
             self.buffer = self.buffer[separator + 1 :]
diff --git a/bumble/smp.py b/bumble/smp.py
index da1c771..a6b213e 100644
--- a/bumble/smp.py
+++ b/bumble/smp.py
@@ -36,6 +36,7 @@ from bumble.colors import color
 from bumble.core import (
     AdvertisingData,
     InvalidArgumentError,
+    InvalidPacketError,
     PhysicalTransport,
     ProtocolError,
 )
@@ -216,7 +217,7 @@ class SMP_Command:
     @classmethod
     def from_bytes(cls, pdu: bytes) -> SMP_Command:
         if not pdu:
-            raise ValueError("Empty SMP PDU")
+            raise InvalidPacketError("Empty SMP PDU")
         code = CommandCode(pdu[0])
 
         subclass = SMP_Command.smp_classes.get(code)