2 files changed, 10 insertions, 12 deletions

diff --git a/cpp/examples/create_queue.cpp b/cpp/examples/create_queue.cpp
index 28a953806c..e30f40c1f6 100644
--- a/cpp/examples/create_queue.cpp
+++ b/cpp/examples/create_queue.cpp
@@ -62,12 +62,11 @@ int main() {
 
   //--------- Main body of program --------------------------------------------
 
-// ## Alan: can I start the channel first, then declare the queue,
-// or does it need to be in this order?
         Queue response("listener");
         channel.declareQueue(response);
-
-        channel.start();
+        channel.bind(Exchange::STANDARD_TOPIC_EXCHANGE, response, "listener");
+        
+	channel.start();
 
   //-----------------------------------------------------------------------------
 
diff --git a/cpp/examples/topic_listener.cpp b/cpp/examples/topic_listener.cpp
index 136a271bf0..3ad32a46cc 100644
--- a/cpp/examples/topic_listener.cpp
+++ b/cpp/examples/topic_listener.cpp
@@ -49,7 +49,7 @@
 
 using namespace qpid::client;
 using namespace qpid::sys;
-using std::string;
+using namespace std;
 
 
 bool done = 0;
@@ -70,30 +70,29 @@ int main() {
         connection.openChannel(channel);
 
   //--------- Main body of program --------------------------------------------
-	Queue response("listener");
-        channel.bind(Exchange::STANDARD_DIRECT_EXCHANGE, response, "listener");
 
+        Queue response("listener");
         Listener listener;
         string routingKey="listener";
         channel.consume(response, routingKey, &listener);
 
         channel.start();
 
-	    while (!done)
-	        ;
+        while (!done)
+            ;
   //-----------------------------------------------------------------------------
 
         channel.close();
         connection.close();
         return 0;
-    } catch(qpid::QpidError error) {
-        // cout << error.what() << std::endl;
+    } catch(std::exception error) {
+        cout << "Unexpected exception: " << error.what() << endl;
     }
     return 1;
 }
 
 void Listener::received(Message& msg) {
-     std::cout << msg.getData();
+    cout << "Message: " << msg.getData() << endl;
      if (msg.getData() == "That's all, folks!")
        done = 1;
 }