diff --git a/code/q3_ui/ui_splevel.c b/code/q3_ui/ui_splevel.c
index 27f7924d..016d9968 100644
--- a/code/q3_ui/ui_splevel.c
+++ b/code/q3_ui/ui_splevel.c
@@ -198,7 +198,12 @@ static void UI_SPLevelMenu_SetBots( void ) {
 			*p++ = 0;
 		}
 
-		botInfo = UI_GetBotInfoByName( bot );
+		botInfo = UI_GetBotInfoByName( bot );
+		if(!botInfo)
+		{
+			botInfo = UI_GetBotInfoByNumber( levelMenuInfo.numBots );
+		}
+	
 		if( botInfo ) {
 			levelMenuInfo.botPics[levelMenuInfo.numBots] = PlayerIconHandle( Info_ValueForKey( botInfo, "model" ) );
 			Q_strncpyz( levelMenuInfo.botNames[levelMenuInfo.numBots], Info_ValueForKey( botInfo, "name" ), 10 );
diff --git a/code/q3_ui/ui_startserver.c b/code/q3_ui/ui_startserver.c
index ddb25333..2c56a10b 100644
--- a/code/q3_ui/ui_startserver.c
+++ b/code/q3_ui/ui_startserver.c
@@ -1092,7 +1092,11 @@ static void ServerOptions_InitBotNames( void ) {
 			*p++ = 0;
 		}
 
-		botInfo = UI_GetBotInfoByName( bot );
+		botInfo = UI_GetBotInfoByName( bot );
+		if( !botInfo )
+		{
+			botInfo = UI_GetBotInfoByNumber( count );
+		}
 		bot = Info_ValueForKey( botInfo, "name" );
 
 		Q_strncpyz( s_serveroptions.playerNameBuffers[count], bot, sizeof(s_serveroptions.playerNameBuffers[count]) );