diff --git a/server/routes/games.js b/server/routes/games.js
index c5f1a63..85b862f 100755
--- a/server/routes/games.js
+++ b/server/routes/games.js
@@ -225,14 +225,14 @@ const processGameOrder = (game, player, dice) => {
       addChatMessage(game, null, message);
       game.playerOrder = players.map(player => getPlayerColor(game, player));
       game.state = 'initial-placement';
-      message = `Initial settlement placement has started!`;
       game.direction = 'forward';
       game.turn = {
         name: getPlayerName(game, players[0]),
         color: getPlayerColor(game, players[0])
       };
       placeSettlement(game, getValidCorners(game));
-      addChatMessage(game, null, message);
+      addChatMessage(game, null, `${game.robberName} Robber Robinson entered the scene as the nefarious robber!`);
+      addChatMessage(game, null, `Initial settlement placement has started!`);
       message = `It is ${game.turn.name}'s turn to place a settlement.`;
     } else {
       message = `There are still ties for player order!`;
@@ -784,7 +784,7 @@ const adminActions = (game, action, value) => {
 
 const setPlayerName = (game, session, name) => {
   if (session.color) {
-    return `You cannot change your name while you are in game.`;
+    return `You cannot change your name while you have a color selected.`;
   }
   
   /* Check to ensure name is not already in use */
@@ -820,7 +820,7 @@ const setPlayerName = (game, session, name) => {
   }
   
   addChatMessage(game, null, message);
-
+  return undefined;
 }
 
 const setPlayerColor = (game, session, color) => {
@@ -2514,7 +2514,6 @@ router.put("/:id/:action/:value?", async (req, res) => {
 
       resetGame(game);
       addChatMessage(game, null, `${name} requested to start the game.`);
-      addChatMessage(game, null, `${game.robberName} Robber Robinson entered the scene as the nefarious robber!`);  
       game.state = state;
       break;
     }