1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/src/qpid/broker/ExchangeRegistry.cpp b/cpp/src/qpid/broker/ExchangeRegistry.cpp
index ae1afe5abb..98e3cc7347 100644
--- a/cpp/src/qpid/broker/ExchangeRegistry.cpp
+++ b/cpp/src/qpid/broker/ExchangeRegistry.cpp
@@ -24,6 +24,7 @@
 #include "HeadersExchange.h"
 #include "TopicExchange.h"
 #include "ManagementExchange.h"
+#include "qpid/framing/reply_exceptions.h"
 
 using namespace qpid::broker;
 using namespace qpid::sys;
@@ -75,9 +76,8 @@ void ExchangeRegistry::destroy(const string& name){
 Exchange::shared_ptr ExchangeRegistry::get(const string& name){
     RWlock::ScopedRlock locker(lock);
     ExchangeMap::iterator i =  exchanges.find(name);
-    if (i == exchanges.end()) {
-        throw ChannelException(404, "Exchange not found: " + name);
-    }
+    if (i == exchanges.end())
+        throw framing::NotFoundException(QPID_MSG("Exchange not found: " << name));
     return i->second;
 }