From 986b8faea5c19c087d6cdb63544233821258e1d1 Mon Sep 17 00:00:00 2001
From: Fernando Velasquez <fevelasquez@google.com>
Date: Tue, 29 Mar 2022 13:33:06 -0400
Subject: [PATCH] Fixed issue with error message displaying during BQ table
 cleanup

---
 .../plugin/gcp/bigquery/sqlengine/BigQuerySQLEngine.java     | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngine.java b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngine.java
index 5db2550d27..46f9d16eb9 100644
--- a/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngine.java
+++ b/src/main/java/io/cdap/plugin/gcp/bigquery/sqlengine/BigQuerySQLEngine.java
@@ -598,8 +598,9 @@ protected void deleteTable(String stageName, BigQuerySQLDataset bqDataset) throw
     String tableName = bqDataset.getBigQueryTable();
     TableId tableId = TableId.of(datasetProject, dataset, tableName);
 
-    if (!bigQuery.delete(tableId)) {
-      LOG.error("Unable to delete BigQuery table '{}' for stage '{}'", tableName, stageName);
+    // Delete this table if found
+    if (bigQuery.getTable(tableId) != null) {
+      bigQuery.delete(tableId);
     }
   }