diff --git a/pus_tm/factory_hook.py b/pus_tm/factory_hook.py
index 865b5f3..dbfd58b 100644
--- a/pus_tm/factory_hook.py
+++ b/pus_tm/factory_hook.py
@@ -24,6 +24,9 @@ def ccsds_tm_handler(apid: int, raw_tm_packet: bytearray, tmtc_printer: TmTcPrin
 
 
 def pus_factory_hook(raw_tm_packet: bytearray, tmtc_printer: TmTcPrinter):
+    if len(raw_tm_packet) < 8:
+        LOGGER.warning("Detected packet shorter than 8 bytes!")
+        return
     service_type = raw_tm_packet[7]
     tm_packet = None
     try: