diff --git a/query_classifier/query_classifier.cc b/query_classifier/query_classifier.cc
index 2f29ddba1..8379c1b89 100644
--- a/query_classifier/query_classifier.cc
+++ b/query_classifier/query_classifier.cc
@@ -865,6 +865,7 @@ char* skygw_get_canonical(
         
         if (querybuf->gwbuf_parsing_info == NULL)
         {
+                querystr = NULL;
                 goto retblock;
         }       
         pi = (parsing_info_t*)querybuf->gwbuf_parsing_info;
@@ -878,6 +879,7 @@ char* skygw_get_canonical(
                         mysql != NULL && 
                         thd != NULL && 
                         lex != NULL);
+                querystr = NULL;
                 goto retblock;
         }