{\r
                        case TELNET_STATE_SendHeader:\r
                                /* Copy over and send the TELNET welcome message upon first connection */\r
-                               strncpy_P(AppData, WelcomeHeader, strlen_P(WelcomeHeader));\r
-                               uip_send(AppData, strlen_P(WelcomeHeader));\r
+                               strcpy_P(AppData, WelcomeHeader);\r
+                               uip_send(AppData, strlen(AppData));\r
                                \r
                                AppState->TELNETServer.NextState = TELNET_STATE_SendMenu;\r
                                break;\r
                        case TELNET_STATE_SendMenu:\r
                                /* Copy over and send the TELNET menu to the client */\r
-                               strncpy_P(AppData, TELNETMenu, strlen_P(TELNETMenu));\r
-                               uip_send(AppData, strlen_P(TELNETMenu));\r
+                               strcpy_P(AppData, TELNETMenu);\r
+                               uip_send(AppData, strlen(AppData));\r
                                \r
                                AppState->TELNETServer.NextState = TELNET_STATE_GetCommand;\r
                                break;\r
                                {\r
                                        case 'c':\r
                                                TELNETServerApp_DisplayTCPConnections();\r
-                                               break;                                  \r
+                                               break;\r
+                                       default:\r
+                                               strcpy(AppData, "Invalid Command.\r\n");\r
+                                               uip_send(AppData, strlen(AppData));\r
+                                               break;\r
                                }\r
 \r
                                AppState->TELNETServer.NextState = TELNET_STATE_SendMenu;\r