diff --git a/amqp_relay.ml b/amqp_relay.ml
index 64ada2f..d75ad30 100644
--- a/amqp_relay.ml
+++ b/amqp_relay.ml
@@ -312,7 +312,7 @@ let handle_method conn channel m =
     | Queue_bind (queue, exchange, routing_key, no_wait, arguments) ->
       let queue = expand_mrdq conn queue in
       if not (Node.approx_exists queue)
-      then send_warning conn not_found ("Queue "^queue.Node.label^" not found")
+      then send_warning conn not_found ("Queue '"^queue.Node.label^"' not found")
       else
 	(match_lwt Node.send' exchange (Message.subscribe (Sexp.Str routing_key,
 							   Sexp.Str queue.Node.label,
@@ -320,7 +320,7 @@ let handle_method conn channel m =
 							   Sexp.Str conn.name.Node.label,
 							   Sexp.Str "Queue_bind_reply")) with
 	  | true -> return ()
-	  | false -> send_warning conn not_found ("Exchange "^exchange^" not found"))
+	  | false -> send_warning conn not_found ("Exchange '"^exchange^"' not found"))
     | Basic_consume (queue, consumer_tag, no_local, no_ack, exclusive, no_wait, arguments) ->
       let queue = expand_mrdq conn queue in
       let consumer_tag = (if consumer_tag = "" then Uuid.create () else consumer_tag) in
@@ -332,7 +332,7 @@ let handle_method conn channel m =
 				     Sexp.Arr [Sexp.Str "Basic_consume_reply";
 					       Sexp.Str consumer_tag])) with
 	| true -> return ()
-	| false -> send_warning conn not_found ("Queue "^queue.Node.label^" not found"))
+	| false -> send_warning conn not_found ("Queue '"^queue.Node.label^"' not found"))
     | Basic_publish (exchange, routing_key, false, false) ->
       lwt (_, (body_size, properties)) = next_header conn in
       lwt body = recv_content_body conn body_size in