1 files changed, 16 insertions, 11 deletions
diff --git a/cpp/src/qpid/broker/SessionAdapter.cpp b/cpp/src/qpid/broker/SessionAdapter.cpp
index 1830b2b94c..9a90c2d970 100644
--- a/cpp/src/qpid/broker/SessionAdapter.cpp
+++ b/cpp/src/qpid/broker/SessionAdapter.cpp
@@ -220,17 +220,22 @@ bool SessionAdapter::QueueHandlerImpl::isLocal(const ConnectionToken* t) const
 
 QueueQueryResult SessionAdapter::QueueHandlerImpl::query(const string& name)
 {
-    Queue::shared_ptr queue = getQueue(name);
-    Exchange::shared_ptr alternateExchange = queue->getAlternateExchange();
-
-    return QueueQueryResult(queue->getName(), 
-                            alternateExchange ? alternateExchange->getName() : "", 
-                            queue->isDurable(), 
-                            queue->hasExclusiveOwner(),
-                            queue->isAutoDelete(),
-                            queue->getSettings(),
-                            queue->getMessageCount(),
-                            queue->getConsumerCount());
+    Queue::shared_ptr queue = session.getBroker().getQueues().find(name);
+    if (queue) {
+
+        Exchange::shared_ptr alternateExchange = queue->getAlternateExchange();
+        
+        return QueueQueryResult(queue->getName(), 
+                                alternateExchange ? alternateExchange->getName() : "", 
+                                queue->isDurable(), 
+                                queue->hasExclusiveOwner(),
+                                queue->isAutoDelete(),
+                                queue->getSettings(),
+                                queue->getMessageCount(),
+                                queue->getConsumerCount());
+    } else {
+        return QueueQueryResult();
+    }
 }
 
 void SessionAdapter::QueueHandlerImpl::declare(const string& name, const string& alternateExchange,