diff --git a/protocol/dmp/dmp.cpp b/protocol/dmp/dmp.cpp
index 5b417aa..924bfde 100644
--- a/protocol/dmp/dmp.cpp
+++ b/protocol/dmp/dmp.cpp
@@ -280,12 +280,14 @@ void Pdu::iStream(PDU::Stream stream)
 
   auto dataIsAddressList = [this, header] () {
       data_ = std::make_shared<address_list>(*header);
-      data_->iStream(stream_);
+      if (stream_ && stream_->good())
+        data_->iStream(stream_);
     };
 
   auto dataIsAdddresPairList = [this, header] () {
       data_ = std::make_shared<address_pair_list>(*header);
-      data_->iStream(stream_);
+      if (stream_ && stream_->good())
+        data_->iStream(stream_);
     };
 
   switch(vector()) {