1 files changed, 4 insertions, 2 deletions
diff --git a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
index 98cc19547a..e217a796f8 100644
--- a/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
+++ b/qpid/cpp/src/qpid/client/amqp0_10/AddressResolution.cpp
@@ -678,8 +678,10 @@ Address AddressResolution::convert(const qpid::framing::ReplyTo& rt)
 {
     Address address;
     if (rt.getExchange().empty()) {//if default exchange, treat as queue
-        address.setName(rt.getRoutingKey());
-        address.setType(QUEUE_ADDRESS);
+        if (!rt.getRoutingKey().empty()) {
+            address.setName(rt.getRoutingKey());
+            address.setType(QUEUE_ADDRESS);
+        }
     } else {
         address.setName(rt.getExchange());
         address.setSubject(rt.getRoutingKey());