diff --git a/p25/data/DataBlock.cpp b/p25/data/DataBlock.cpp
index 0ed986f8..d7da3a49 100644
--- a/p25/data/DataBlock.cpp
+++ b/p25/data/DataBlock.cpp
@@ -61,7 +61,9 @@ DataBlock::DataBlock() :
 /// </summary>
 DataBlock::~DataBlock()
 {
-    delete[] m_data;
+    if (m_data != NULL) {
+        delete[] m_data;
+    }
 }
 
 /// <summary>