diff --git a/common/libeval_compiler/libeval_compiler.cpp b/common/libeval_compiler/libeval_compiler.cpp
index 2b5e59928b..98ec77182a 100644
--- a/common/libeval_compiler/libeval_compiler.cpp
+++ b/common/libeval_compiler/libeval_compiler.cpp
@@ -250,6 +250,7 @@ COMPILER::~COMPILER()
     if( m_tree )
     {
         freeTree( m_tree );
+        m_tree = nullptr;
     }
 
     // Allow explicit call to destructor
@@ -694,6 +695,7 @@ void COMPILER::freeTree( LIBEVAL::TREE_NODE *tree )
         freeTree( tree->leaf[1] );
 
     delete tree->uop;
+    tree->uop = nullptr;
 }