diff --git a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
index fa900b4ec..6de18ce88 100644
--- a/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
+++ b/query_classifier/qc_mysqlembedded/qc_mysqlembedded.cc
@@ -1342,11 +1342,7 @@ char** qc_get_table_names(GWBUF* querybuf, int* tblsize, bool fullnames)
     } /*< while(lex->current_select) */
 
 retblock:
-
-    if (tblsize)
-    {
-        *tblsize = i;
-    }
+    *tblsize = i;
 
     return tables;
 }
diff --git a/query_classifier/qc_sqlite/qc_sqlite.c b/query_classifier/qc_sqlite/qc_sqlite.c
index 910bd323c..91149d47c 100644
--- a/query_classifier/qc_sqlite/qc_sqlite.c
+++ b/query_classifier/qc_sqlite/qc_sqlite.c
@@ -2971,6 +2971,8 @@ static char** qc_sqlite_get_table_names(GWBUF* query, int* tblsize, bool fullnam
     char** table_names = NULL;
     QC_SQLITE_INFO* info = get_query_info(query);
 
+    *tblsize = 0;
+
     if (info)
     {
         if (qc_info_is_valid(info->status))
@@ -3054,6 +3056,8 @@ static char** qc_sqlite_get_database_names(GWBUF* query, int* sizep)
     char** database_names = NULL;
     QC_SQLITE_INFO* info = get_query_info(query);
 
+    *sizep = 0;
+
     if (info)
     {
         if (qc_info_is_valid(info->status))