diff --git a/Example2/Echo.cs b/Example2/Echo.cs
index c1cce786..8a5f359c 100644
--- a/Example2/Echo.cs
+++ b/Example2/Echo.cs
@@ -9,8 +9,8 @@ namespace Example2
   {
     protected override void OnMessage (MessageEventArgs e)
     {
-      var name = Context.QueryString ["name"];
-      var msg = name != null
+      var name = Context.QueryString ["name"] ?? String.Empty;
+      var msg = name.Length > 0
               ? String.Format ("'{0}' to {1}", e.Data, name)
               : e.Data;
 
diff --git a/Example2/Program.cs b/Example2/Program.cs
index b45eeb56..f6ef0111 100644
--- a/Example2/Program.cs
+++ b/Example2/Program.cs
@@ -46,7 +46,7 @@ namespace Example2
       wssv.Start ();
       if (wssv.IsListening) {
         Console.WriteLine (
-          "A WebSocket Server listening on port: {0} service paths:", wssv.Port);
+          "A WebSocket server listening on port: {0} service paths:", wssv.Port);
 
         foreach (var path in wssv.WebSocketServices.ServicePaths)
           Console.WriteLine ("  {0}", path);