diff --git a/EosLib/packet/packet.py b/EosLib/packet/packet.py
index 54a3093..b57a2ae 100644
--- a/EosLib/packet/packet.py
+++ b/EosLib/packet/packet.py
@@ -141,8 +141,10 @@ def decode(packet_bytes: bytes):
             decoded_data_header = decoded_data_header
             packet_bytes = packet_bytes[struct.calcsize(DataHeader.data_header_struct_format_string):]
         else:
-            decoded_data_header = DataHeader(sender=Device.RADIO, data_type=Type.EMPTY)
-            #raise PacketFormatError(f"Packet does not contain a header. Unexpected packet header: {packet_bytes[0]}, should be: {HeaderPreamble.DATA}")
+            decoded_data_header = DataHeader.decode(
+                packet_bytes[0:struct.calcsize(DataHeader.data_header_struct_format_string)])
+            raise PacketFormatError(f"Packet does not contain a header. Unexpected packet header: {packet_bytes[0]}, \
+                                    should be: {HeaderPreamble.DATA}. Decoded header: {decoded_data_header}")
 
         decoded_packet = Packet(EosLib.format.decode_factory.decode_factory.decode(decoded_data_header.data_type,
                                                                                    packet_bytes),