diff --git a/dbcon/execplan/simplefilter.cpp b/dbcon/execplan/simplefilter.cpp
index 4916a129c..e6d544b02 100644
--- a/dbcon/execplan/simplefilter.cpp
+++ b/dbcon/execplan/simplefilter.cpp
@@ -150,8 +150,14 @@ SimpleFilter::SimpleFilter(const SimpleFilter& rhs) :
 SimpleFilter::~SimpleFilter()
 {
     //delete fOp;
-    delete fLhs;
-    delete fRhs;
+    if (fLhs != NULL)
+        delete fLhs;
+
+    if (fRhs != NULL)
+        delete fRhs;
+
+    fLhs = NULL;
+    fRhs = NULL;
 }
 
 /**
diff --git a/dbcon/joblist/jlf_common.h b/dbcon/joblist/jlf_common.h
index fe6c477d9..313c4a7d1 100644
--- a/dbcon/joblist/jlf_common.h
+++ b/dbcon/joblist/jlf_common.h
@@ -364,6 +364,11 @@ struct JobInfo
     bool isDML;
     std::string timeZone;
 
+    // This is for tracking any dynamically allocated ParseTree objects
+    // in simpleScalarFilterToParseTree() for later deletion in
+    // JobList::~JobList()
+    std::vector<std::pair<execplan::ParseTree*, execplan::ParseTree*>> dynamicParseTreeVec;
+
 private:
     //defaults okay
     //JobInfo(const JobInfo& rhs);
diff --git a/dbcon/joblist/jlf_execplantojoblist.cpp b/dbcon/joblist/jlf_execplantojoblist.cpp
index 35f4110fa..8d72f893f 100644
--- a/dbcon/joblist/jlf_execplantojoblist.cpp
+++ b/dbcon/joblist/jlf_execplantojoblist.cpp
@@ -3269,6 +3269,12 @@ void doOR(ParseTree* n, JobInfo& jobInfo, bool tryCombine)
                             ccp->left(parseTree->left());
                             ccp->right(parseTree->right());
                             ccp->data(parseTree->data());
+                            jobInfo.dynamicParseTreeVec.push_back(make_pair(parseTree, ccp));
+                        }
+                        else if (parseTree)
+                        {
+                            delete parseTree;
+                            parseTree = NULL;
                         }
                     }
 
diff --git a/dbcon/joblist/jlf_subquery.cpp b/dbcon/joblist/jlf_subquery.cpp
index 008bdc758..1b6acb8ad 100644
--- a/dbcon/joblist/jlf_subquery.cpp
+++ b/dbcon/joblist/jlf_subquery.cpp
@@ -192,7 +192,10 @@ void ssfInHaving(ParseTree* pt, void* obj)
             pt->right(parseTree->right());
             pt->data(parseTree->data());
 
+            jobInfo->dynamicParseTreeVec.push_back(make_pair(parseTree, pt));
             // don't delete the parseTree, it has been placed in the plan.
+            // Instead, we use the dynamicParseTreeVec above for deletion
+            // in the JobList dtor after the query executes.
             // delete parseTree;
         }
         else
@@ -627,7 +630,10 @@ void doSimpleScalarFilter(ParseTree* p, JobInfo& jobInfo)
         // create job steps for each simple filter
         JLF_ExecPlanToJobList::walkTree(parseTree, jobInfo);
 
+        jobInfo.dynamicParseTreeVec.push_back(make_pair(parseTree, ccp));
         // don't delete the parseTree, it has been placed in the plan.
+        // Instead, we use the dynamicParseTreeVec above for deletion
+        // in the JobList dtor after the query executes.
         // delete parseTree;
     }
     else
diff --git a/dbcon/joblist/joblist.cpp b/dbcon/joblist/joblist.cpp
index 8a8a89065..42c386a3d 100644
--- a/dbcon/joblist/joblist.cpp
+++ b/dbcon/joblist/joblist.cpp
@@ -142,6 +142,26 @@ JobList::~JobList()
                 (*iter)->join();
             }
         }
+
+        for (auto& parseTree : fDynamicParseTreeVec)
+        {
+            if (parseTree.first)
+            {
+                delete parseTree.first;
+                parseTree.first = NULL;
+                // Note that we don't delete parseTree.second here,
+                // that is handled by CalpontSelectExecutionPlan::unserialize().
+                // parseTree.first already deleted the objects pointed to by
+                // parseTree.second->left()/right()/data(), so we set the
+                // pointers to NULL here.
+                if (parseTree.second)
+                {
+                    parseTree.second->left((ParseTree*) (NULL));
+                    parseTree.second->right((ParseTree*) (NULL));
+                    parseTree.second->data((TreeNode*) (NULL));
+                }
+            }
+        }
     }
     catch (exception& ex)
     {
diff --git a/dbcon/joblist/joblist.h b/dbcon/joblist/joblist.h
index 4940e038d..5f30b17e5 100644
--- a/dbcon/joblist/joblist.h
+++ b/dbcon/joblist/joblist.h
@@ -34,6 +34,7 @@
 
 #include "jobstep.h"
 #include "bytestream.h"
+#include "parsetree.h"
 
 #ifndef __GNUC__
 #  ifndef __attribute__
@@ -190,6 +191,12 @@ public:
         fPmsConfigured = pms;
     }
 
+    virtual void setDynamicParseTreeVec(
+        const std::vector<std::pair<execplan::ParseTree*, execplan::ParseTree*>>& dynamicParseTreeVec)
+    {
+        fDynamicParseTreeVec = dynamicParseTreeVec;
+    }
+
 protected:
     //defaults okay
     //JobList(const JobList& rhs);
@@ -217,6 +224,7 @@ protected:
     volatile uint32_t fAborted;
 
     uint32_t fPriority;   //higher #s = higher priority
+    std::vector<std::pair<execplan::ParseTree*, execplan::ParseTree*>> fDynamicParseTreeVec;
 };
 
 class TupleJobList : public JobList
diff --git a/dbcon/joblist/joblistfactory.cpp b/dbcon/joblist/joblistfactory.cpp
index d762d912c..972ae904d 100644
--- a/dbcon/joblist/joblistfactory.cpp
+++ b/dbcon/joblist/joblistfactory.cpp
@@ -2003,6 +2003,7 @@ SJLP makeJobList_(
         jl->addQuery(querySteps);
         jl->addProject(projectSteps);
         jl->addDelivery(deliverySteps);
+        jl->setDynamicParseTreeVec(jobInfo.dynamicParseTreeVec);
 
         dynamic_cast<TupleJobList*>(jl)->setDeliveryFlag(true);
     }