diff --git a/src/main/java/com/microsoft/sqlserver/jdbc/tdsparser.java b/src/main/java/com/microsoft/sqlserver/jdbc/tdsparser.java
index edf232336..113ca4471 100644
--- a/src/main/java/com/microsoft/sqlserver/jdbc/tdsparser.java
+++ b/src/main/java/com/microsoft/sqlserver/jdbc/tdsparser.java
@@ -251,10 +251,14 @@ boolean onOrder(TDSReader tdsReader) throws SQLServerException {
     }
 
     boolean onColMetaData(TDSReader tdsReader) throws SQLServerException {
-        // SHOWPLAN might be ON, instead of throwing an exception, ignore the column meta data
-        if (logger.isLoggable(Level.SEVERE))
-            logger.severe(tdsReader.toString() + ": " + logContext + ": Encountered "
-                    + TDS.getTokenName(tdsReader.peekTokenType()) + ". SHOWPLAN is ON, ignoring.");
+        /*
+         * SHOWPLAN or something else that produces extra metadata might be ON. instead of throwing an exception, warn
+         * and discard the column meta data
+         */
+        if (logger.isLoggable(Level.WARNING))
+            logger.warning(tdsReader.toString() + ": " + logContext + ": Discarding unexpected "
+                    + TDS.getTokenName(tdsReader.peekTokenType()));
+        (new StreamColumns(false)).setFromTDS(tdsReader);
         return false;
     }