diff --git a/dbcon/mysql/ha_mcs_execplan_walks.cpp b/dbcon/mysql/ha_mcs_execplan_walks.cpp
index e6078b5ab..802f382c6 100644
--- a/dbcon/mysql/ha_mcs_execplan_walks.cpp
+++ b/dbcon/mysql/ha_mcs_execplan_walks.cpp
@@ -815,6 +815,12 @@ void gp_walk(const Item* item, void* arg)
     }
   }
 
+  // Clean up allocated objects if a fatal parse error occurred
+  if (gwip->fatalParseError)
+  {
+    clearDeleteStacks(*gwip);
+  }
+
   return;
 }