diff --git a/acn/dmp.cpp b/acn/dmp.cpp
index d73e318..939b1af 100644
--- a/acn/dmp.cpp
+++ b/acn/dmp.cpp
@@ -88,8 +88,6 @@ size_t range::streamSize() const
  */
 void range::iStream(PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
   address   = read_(stream);
   if (type_ == SINGLE) return;
   incriment = read_(stream);
diff --git a/acn/sdt.cpp b/acn/sdt.cpp
index 445f92c..ae78b9f 100644
--- a/acn/sdt.cpp
+++ b/acn/sdt.cpp
@@ -33,8 +33,6 @@ namespace SDT {
  */
 void params_t::iStream(PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
   *stream >> Expiry;
   uint8_t packed;
   *stream >> packed;
@@ -52,8 +50,6 @@ void params_t::iStream(PDU::Stream stream)
  */
 void join_data_t::iStream(PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
   *stream >> mid;
   *stream >> number;
   *stream >> reciprocal;
@@ -71,9 +67,6 @@ void join_data_t::iStream(PDU::Stream stream)
  */
 void join_accept_data_t::iStream(PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   *stream >> leader;
   *stream >> number;
   *stream >> mid;
@@ -88,9 +81,6 @@ void join_accept_data_t::iStream(PDU::Stream stream)
  */
 void join_refuse_data_t::iStream(PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   *stream >> leader;
   *stream >> number;
   *stream >> mid;
@@ -105,9 +95,6 @@ void join_refuse_data_t::iStream(PDU::Stream stream)
  */
 void nak_data_t::iStream(PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   *stream >> leader;
   *stream >> number;
   *stream >> mid;
@@ -123,8 +110,6 @@ void nak_data_t::iStream(PDU::Stream stream)
  */
 void wrapper_data_t::iStream(PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
   *stream >> number;
 }
 
diff --git a/rdmnet/broker-protocol.cpp b/rdmnet/broker-protocol.cpp
index ce121ae..f65783c 100644
--- a/rdmnet/broker-protocol.cpp
+++ b/rdmnet/broker-protocol.cpp
@@ -101,9 +101,6 @@ void Pdu::iStream(ACN::PDU::Stream stream)
  */
 void client_connect_data::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   char scope_buffer[63];
   char domain_buffer[231];
 
@@ -157,9 +154,6 @@ void client_connect_data::oStream(ACN::PDU::Stream stream) const
  */
 void connect_reply_data::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   *stream >> code;
   *stream >> version;
   *stream >> broker_uid;
@@ -186,9 +180,6 @@ void connect_reply_data::oStream(ACN::PDU::Stream stream) const
  */
 void client_entry_update_data::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   *stream >> flags.byte;
   pdu->iStream(stream);
 }
@@ -211,9 +202,6 @@ void client_entry_update_data::oStream(ACN::PDU::Stream stream) const
  */
 void client_redirect_ipv4_data::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   *stream >> ip;
   *stream >> port;
 }
@@ -236,9 +224,6 @@ void client_redirect_ipv4_data::oStream(ACN::PDU::Stream stream) const
  */
 void client_redirect_ipv6_data::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   stream->read(ip, sizeof(ip));
   if (stream->gcount() != sizeof(ip))
     return stream->setstate(std::ios_base::failbit);
@@ -263,9 +248,6 @@ void client_redirect_ipv6_data::oStream(ACN::PDU::Stream stream) const
  */
 void dynamic_uid_request::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   *stream >> uid;
   *stream >> rid;
 }
@@ -313,9 +295,6 @@ void request_dynamic_uid_data::oStream(ACN::PDU::Stream stream) const
  */
 void dynamic_uid_mapping::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   *stream >> uid;
   *stream >> rid;
   *stream >> status;
@@ -432,9 +411,6 @@ size_t entry_header::streamSize() const
  */
 void entry_header::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   *stream >> cid;
 }
 
@@ -455,9 +431,6 @@ void entry_header::oStream(ACN::PDU::Stream stream) const
  */
 void entry_rpt_data::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   *stream >> client_uid;
   *stream >> client_type;
   *stream >> binding_cid;
diff --git a/rdmnet/llrp.cpp b/rdmnet/llrp.cpp
index 58f012e..49814a8 100644
--- a/rdmnet/llrp.cpp
+++ b/rdmnet/llrp.cpp
@@ -33,8 +33,6 @@ namespace LLRP {
   */
 void llrp_data::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
   /// Destination CID - The Destination CID indicates the CID of the intended
   /// recipient of this PDU.
   *stream >> destination;
@@ -121,9 +119,6 @@ namespace ProbeRequest {
  */
 void request_data::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   *stream >> lower;
   *stream >> upper;
   *stream >> filter.value;
@@ -179,9 +174,6 @@ namespace ProbeReply {
  */
 void reply_data::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   *stream >> id;
   stream->read(address, sizeof(address));
   if (stream->gcount() != sizeof(address))
@@ -230,9 +222,6 @@ namespace RdmCmd {
  */
 void rdm_data::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   auto buffer = std::vector<uint8_t>();
   buffer.push_back(RDM::SC_RDM);
   while (stream->good())
diff --git a/rdmnet/llrp.h b/rdmnet/llrp.h
index 4888fa8..1e89d45 100644
--- a/rdmnet/llrp.h
+++ b/rdmnet/llrp.h
@@ -98,6 +98,7 @@ struct request_data
   RDM::UID upper;
   filter_t filter;
   std::vector<RDM::UID> known;
+
   size_t streamSize() const override { return 14 + (6 * known.size()); }
   void   iStream(ACN::PDU::Stream) override;
   void   oStream(ACN::PDU::Stream) const override;
diff --git a/sacn/data.cpp b/sacn/data.cpp
index 054b39c..9de20d7 100644
--- a/sacn/data.cpp
+++ b/sacn/data.cpp
@@ -49,9 +49,6 @@ size_t data_header::streamSize() const
  */
 void data_header::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   stream->read(source_name, sizeof(source_name));
   if (stream->gcount() != sizeof(source_name))
     return stream->setstate(std::ios_base::failbit);
diff --git a/sacn/extended.cpp b/sacn/extended.cpp
index cd57e0f..ac5d688 100644
--- a/sacn/extended.cpp
+++ b/sacn/extended.cpp
@@ -47,9 +47,6 @@ size_t sync_header::streamSize() const
  */
 void sync_header::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   *stream >> sequence_number;
   *stream >> sync_address;
   stream->read(reserved, sizeof(reserved));
@@ -85,9 +82,6 @@ size_t discovery_header::streamSize() const
  */
 void discovery_header::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   stream->read(source_name, sizeof(source_name));
   if (stream->gcount() != sizeof(source_name))
     return stream->setstate(std::ios_base::failbit);
@@ -152,9 +146,6 @@ size_t discovery_list_header::streamSize() const
  */
 void discovery_list_header::iStream(ACN::PDU::Stream stream)
 {
-  if (!stream->good())
-    return;
-
   *stream >> page;
   *stream >> last_page;
 }