diff --git a/activemq-core/src/gram/java/org/activemq/openwire/tool/OpenWireScript.java b/activemq-core/src/gram/java/org/activemq/openwire/tool/OpenWireScript.java
index 1f55990dbf..d50ebc14e5 100755
--- a/activemq-core/src/gram/java/org/activemq/openwire/tool/OpenWireScript.java
+++ b/activemq-core/src/gram/java/org/activemq/openwire/tool/OpenWireScript.java
@@ -80,7 +80,10 @@ public abstract class OpenWireScript extends GramSupport {
         if (name.equals("String")) {
             return "string";
         }
-        else if (name.equals("Throwable") || name.equals("Exception") || name.equals("ByteSequence")) {
+        else if (name.equals("Throwable") || name.equals("Exception")) {
+            return "BrokerError";
+        }
+        else if (name.equals("ByteSequence")) {
             return "byte[]";
         }
         else if (name.equals("boolean")) {
diff --git a/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy b/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy
index 644e66f883..04f3136cf0 100755
--- a/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy
+++ b/activemq-core/src/gram/script/GenerateCSharpMarshalling.groovy
@@ -177,6 +177,10 @@ namespace OpenWire.Client.IO
                             out << "ReadDestination(dataIn)"
                             break;
 
+                        case "BrokerError":
+                            out << "ReadBrokerError(dataIn)"
+                            break;
+
                         case "BrokerId[]":
                             out << "ReadBrokerIds(dataIn)"
                             break;
@@ -274,6 +278,10 @@ namespace OpenWire.Client.IO
                             out << "WriteDestination($getter, dataOut);"
                             break;
 
+                        case "BrokerError":
+                            out << "WriteBrokerError($getter, dataOut);"
+                            break;
+
                         case "BrokerId[]":
                             out << "WriteBrokerIds($getter, dataOut);"
                             break;