diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/RowFormatter.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/RowFormatter.java
index 81953d6c4..82737843d 100644
--- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/RowFormatter.java
+++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/engine/store/RowFormatter.java
@@ -1039,8 +1039,12 @@ public RowFormatter(final ColumnDescriptorList cdl, final String schemaName,
     this.metadata = null;
     this.isTableFormatter = false;
     this.isPrimaryKeyFormatter = false;
-    SanityManager.DEBUG_PRINT(GfxdConstants.TRACE_ROW_FORMATTER,
-        "RowFormatter#cqi#column[] = " + ArrayUtils.toString(this.columns));
+    if (SanityManager.DEBUG) {
+      if (GemFireXDUtils.TraceRowFormatter) {
+        SanityManager.DEBUG_PRINT(GfxdConstants.TRACE_ROW_FORMATTER,
+            "RowFormatter#cqi#column[] = " + ArrayUtils.toString(this.columns));
+      }
+    }
   }
 
   /**
@@ -1105,8 +1109,12 @@ public RowFormatter(final ColumnDescriptor[] cdl, final int size,
       this.isTableFormatter = true;
     }
     this.isPrimaryKeyFormatter = false;
-    SanityManager.DEBUG_PRINT(GfxdConstants.TRACE_ROW_FORMATTER,
-        "RowFormatter#const1#column[] = " + ArrayUtils.toString(this.columns));
+    if (SanityManager.DEBUG) {
+      if (GemFireXDUtils.TraceRowFormatter) {
+        SanityManager.DEBUG_PRINT(GfxdConstants.TRACE_ROW_FORMATTER,
+            "RowFormatter#const1#column[] = " + ArrayUtils.toString(this.columns));
+      }
+    }
   }
 
   /**
@@ -1225,8 +1233,12 @@ private RowFormatter(final ColumnDescriptorList cdl, final int size,
     this.metadata = null;
     this.isTableFormatter = false;
     this.isPrimaryKeyFormatter = false;
-    SanityManager.DEBUG_PRINT(GfxdConstants.TRACE_ROW_FORMATTER,
-        "RowFormatter#const3#column[] = " + ArrayUtils.toString(this.columns));
+    if (SanityManager.DEBUG) {
+      if (GemFireXDUtils.TraceRowFormatter) {
+        SanityManager.DEBUG_PRINT(GfxdConstants.TRACE_ROW_FORMATTER,
+            "RowFormatter#const3#column[] = " + ArrayUtils.toString(this.columns));
+      }
+    }
   }
 
   /**
@@ -1287,14 +1299,23 @@ private RowFormatter(final ColumnDescriptorList cdl, final int size,
     this.metadata = getMetaData(schemaName, tableName, schemaVersion);
     this.isTableFormatter = false;
     this.isPrimaryKeyFormatter = isPrimaryKeyFormatter;
-    SanityManager.DEBUG_PRINT(GfxdConstants.TRACE_ROW_FORMATTER,
-        "RowFormatter#const4#column[] = " + ArrayUtils.toString(this.columns));
+    if (SanityManager.DEBUG) {
+      if (GemFireXDUtils.TraceRowFormatter) {
+        SanityManager.DEBUG_PRINT(GfxdConstants.TRACE_ROW_FORMATTER,
+            "RowFormatter#const4#column[] = " + ArrayUtils.toString(this.columns));
+      }
+    }
   }
 
   public void printColumnArray() {
-    SanityManager.DEBUG_PRINT(GfxdConstants.TRACE_ROW_FORMATTER,
-        "RowFormatter#Recovery#column[] = " + ArrayUtils.toString(this.columns));
+    if (SanityManager.DEBUG) {
+      if (GemFireXDUtils.TraceRowFormatter) {
+        SanityManager.DEBUG_PRINT(GfxdConstants.TRACE_ROW_FORMATTER,
+            "RowFormatter#Recovery#column[] = " + ArrayUtils.toString(this.columns));
+      }
+    }
   }
+
   /**
    * Get the fixed width, variable width and LOB column positions for this
    * formatter.
diff --git a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/services/context/ContextManager.java b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/services/context/ContextManager.java
index 2bf964970..6e8af1f54 100644
--- a/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/services/context/ContextManager.java
+++ b/gemfirexd/core/src/main/java/com/pivotal/gemfirexd/internal/iapi/services/context/ContextManager.java
@@ -52,6 +52,7 @@ Licensed to the Apache Software Foundation (ASF) under one or more
 import com.pivotal.gemfirexd.internal.iapi.error.ShutdownException;
 import com.pivotal.gemfirexd.internal.iapi.error.StandardException;
 import com.pivotal.gemfirexd.internal.iapi.reference.Property;
+import com.pivotal.gemfirexd.internal.iapi.reference.SQLState;
 import com.pivotal.gemfirexd.internal.iapi.services.i18n.LocaleFinder;
 import com.pivotal.gemfirexd.internal.iapi.services.monitor.Monitor;
 import com.pivotal.gemfirexd.internal.iapi.services.property.PropertyUtil;
@@ -742,6 +743,11 @@ private boolean reportError(Throwable t) {
 				            this.errorStream.getLogSeverityLevel());
 				  }
 				}
+				// SNAP-3176
+				if (se.getSQLState().equals(SQLState.LANG_SYNTAX_ERROR)
+						|| se.getSQLState().equals(SQLState.LANG_LEXICAL_ERROR)) {
+					return false;
+				}
 // GemStone changes END
 				return (level >= logSeverityLevel) ||
 					(level == ExceptionSeverity.NO_APPLICABLE_SEVERITY);