diff --git a/CHANGES.txt b/CHANGES.txt
index fd1f5af1c3..e48117a321 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -1,4 +1,5 @@
 2.1.1
+ * (cqlsh) Error when tracing query (CASSANDRA-7613)
  * Avoid IOOBE when building SyntaxError message snippet (CASSANDRA-7569)
  * SSTableExport uses correct validator to create string representation of partition
    keys (CASSANDRA-7498)
diff --git a/bin/cqlsh b/bin/cqlsh
index 5b63696ecd..1a2df86e69 100755
--- a/bin/cqlsh
+++ b/bin/cqlsh
@@ -584,13 +584,14 @@ class Shell(cmd.Cmd):
             self.decoding_errors.append(err)
             return format_value(err, self.output_codec.name, addcolor=self.color)
 
-    def myformat_colname(self, name, cfMetaData):
+    def myformat_colname(self, name, cfMetaData = None):
         column_colors = COLUMN_NAME_COLORS.copy()
         # check column role and color appropriately
-        if name in [col.name for col in cfMetaData.partition_key]:
-            column_colors.default_factory = lambda : RED
-        elif name in [col.name for col in cfMetaData.clustering_key]:
-            column_colors.default_factory = lambda : CYAN
+        if cfMetaData:
+            if name in [col.name for col in cfMetaData.partition_key]:
+                column_colors.default_factory = lambda : RED
+            elif name in [col.name for col in cfMetaData.clustering_key]:
+                column_colors.default_factory = lambda : CYAN
         return self.myformat_value(name, colormap=column_colors)
 
     def report_connection(self):