diff --git a/CHANGES.txt b/CHANGES.txt
index 6b4e44bcb0..d39cf63a29 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -13,6 +13,8 @@
  * Add option to disable STCS in L0 (CASSANDRA-6621)
  * Fix error when doing reversed queries with static columns (CASSANDRA-7490)
 Merged from 1.2:
+ * Set correct stream ID on responses when non-Exception Throwables
+   are thrown while handling native protocol messages (CASSANDRA-7470)
 
 
 2.0.9
diff --git a/src/java/org/apache/cassandra/transport/Message.java b/src/java/org/apache/cassandra/transport/Message.java
index eea3b48a90..bbe7e38a6d 100644
--- a/src/java/org/apache/cassandra/transport/Message.java
+++ b/src/java/org/apache/cassandra/transport/Message.java
@@ -312,7 +312,7 @@ public abstract class Message
 
                 ctx.getChannel().write(response);
             }
-            catch (Exception ex)
+            catch (Throwable ex)
             {
                 // Don't let the exception propagate to exceptionCaught() if we can help it so that we can assign the right streamID.
                 ctx.getChannel().write(ErrorMessage.fromException(ex).setStreamId(request.getStreamId()));