1 files changed, 4 insertions, 13 deletions
diff --git a/cpp/src/qpid/client/Dispatcher.cpp b/cpp/src/qpid/client/Dispatcher.cpp
index fd6a18b349..37fada45fb 100644
--- a/cpp/src/qpid/client/Dispatcher.cpp
+++ b/cpp/src/qpid/client/Dispatcher.cpp
@@ -75,20 +75,11 @@ void Dispatcher::run()
         if (content->isA<MessageTransferBody>()) {
             Message msg(*content, session);
             Subscriber::shared_ptr listener = find(msg.getDestination());
-            if (!listener) {
-                // FIXME aconway 2007-11-07: Should close session & throw here?
-                QPID_LOG(error, "No message listener for "
-                         << content->getMethod());
-            } else {
-                listener->received(msg);
-            }
+            assert(listener);
+            listener->received(msg);
         } else {
-            if (handler.get()) {
-                handler->handle(*content);
-            } else {
-                // FIXME aconway 2007-11-07: Should close session & throw here?
-                QPID_LOG(error, "Unhandled method: " << content->getMethod());                                        
-            }
+            assert (handler.get());
+            handler->handle(*content);
         }
     }
 }