diff --git a/server/routes/games.js b/server/routes/games.js
index f59b368..cdb7a7f 100755
--- a/server/routes/games.js
+++ b/server/routes/games.js
@@ -275,10 +275,10 @@ const setPlayerName = (game, session, name) => {
     if (!old) {
       message = `A new player has entered the lobby as ${name}.`;
     } else {
-      message = `${name} has chosen to play as ${old}.`;
+      message = `${old} has changed their name to ${name}.`;
     }
   } else {
-    message = `Nobody is playing ${old} any more.`;
+    return `You can not set your name to nothing!`;
   }
   
   game.chat.push({