diff --git a/qpid/cpp/src/qpid/broker/QueueRegistry.cpp b/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
index c3cd348..987832c 100644
--- a/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
@@ -133,8 +133,8 @@
         qpid::sys::RWlock::ScopedWlock locker(lock);
         QueueMap::iterator i = queues.find(name);
         if (i != queues.end()) {
-            q = i->second;
-            if (q->version == version) {
+            if (i->second->version == version) {
+                q = i->second;
                 eraseLH(i, q, name, connectionId, userId);
             }
         }