2 files changed, 4 insertions, 3 deletions
diff --git a/cpp/src/qpid/client/Message.h b/cpp/src/qpid/client/Message.h
index 655fc89457..b2ae273813 100644
--- a/cpp/src/qpid/client/Message.h
+++ b/cpp/src/qpid/client/Message.h
@@ -38,7 +38,10 @@ namespace client {
 class Message : public framing::TransferContent 
 {
 public:
-    Message(const std::string& data_=std::string()) : TransferContent(data_) {}
+    Message(const std::string& data_=std::string(),
+            const std::string& routingKey=std::string(),
+            const std::string& exchange=std::string()
+    ) : TransferContent(data_, routingKey, exchange) {}
 
     std::string getDestination() const 
     { 
diff --git a/cpp/src/qpid/client/SessionCore.cpp b/cpp/src/qpid/client/SessionCore.cpp
index ea877f9b40..f7f0f52dba 100644
--- a/cpp/src/qpid/client/SessionCore.cpp
+++ b/cpp/src/qpid/client/SessionCore.cpp
@@ -62,13 +62,11 @@ inline void SessionCore::invariant() const {
       case CLOSING:
       case SUSPENDING:
         assert(session);
-        assert(code==REPLY_SUCCESS);
         assert(connection);
         assert(channel.get());
         assert(channel.next == connection.get());
         break;
       case SUSPENDED:
-        assert(code==REPLY_SUCCESS);
         assert(session);
         assert(!connection);
         break;