diff --git a/conn.go b/conn.go
index 5eb17df..75ad9ce 100644
--- a/conn.go
+++ b/conn.go
@@ -9,6 +9,7 @@ import (
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/athena"
 	"github.com/aws/aws-sdk-go/service/athena/athenaiface"
+	"github.com/sirupsen/logrus"
 )
 
 type conn struct {
@@ -42,7 +43,7 @@ func (c *conn) runQuery(ctx context.Context, query string) (driver.Rows, error)
 	if err != nil {
 		return nil, err
 	}
-
+	logrus.Infof("executing query : %s :: with queryID : %s ", query, queryID)
 	if err := c.waitOnQuery(ctx, queryID); err != nil {
 		return nil, err
 	}
@@ -83,6 +84,7 @@ func (c *conn) waitOnQuery(ctx context.Context, queryID string) error {
 			return err
 		}
 
+		logrus.Infof("queryID : %s :: query status %s ", queryID, *statusResp.QueryExecution.Status)
 		switch *statusResp.QueryExecution.Status.State {
 		case athena.QueryExecutionStateCancelled:
 			return context.Canceled
diff --git a/rows.go b/rows.go
index f010cb9..3f72f9e 100644
--- a/rows.go
+++ b/rows.go
@@ -2,13 +2,22 @@ package athena
 
 import (
 	"database/sql/driver"
+	"fmt"
 	"io"
+	"strings"
+
+	"github.com/sirupsen/logrus"
 
 	"github.com/aws/aws-sdk-go/aws"
 	"github.com/aws/aws-sdk-go/service/athena"
 	"github.com/aws/aws-sdk-go/service/athena/athenaiface"
 )
 
+var listOfFailedQueryResult = []string{
+	"FAILED:",
+	"Tables missing on filesystem:",
+}
+
 type rows struct {
 	athena  athenaiface.AthenaAPI
 	queryID string
@@ -107,7 +116,13 @@ func (r *rows) fetchNextPage(token *string) (bool, error) {
 		rowOffset = 1
 		r.skipHeaderRow = false
 	}
+	logrus.Debugf("queryId : %s :: resultset : %v ", r.queryID, r.out.ResultSet)
 
+	for _, failedSubstring := range listOfFailedQueryResult {
+		if len(r.out.ResultSet.Rows) > 0 && strings.Contains(r.out.ResultSet.Rows[0].String(), failedSubstring) {
+			return false, fmt.Errorf("queryId : %s :: failed due to : %v  ", r.queryID, r.out.ResultSet.String())
+		}
+	}
 	if len(r.out.ResultSet.Rows) < rowOffset+1 {
 		return false, nil
 	}