diff --git a/src/g_gamedata.cpp b/src/g_gamedata.cpp
index 1fd9e3ab3..be218c5ca 100644
--- a/src/g_gamedata.cpp
+++ b/src/g_gamedata.cpp
@@ -214,7 +214,7 @@ void srb2::save_ng_gamedata()
 			{
 				newrecords.bestskin = String(skinref.unloaded->name);
 			}
-			else
+			else if (skinref.id < numskins)
 			{
 				newrecords.bestskin = String(skins[skinref.id].name);
 			}
diff --git a/src/k_menudraw.c b/src/k_menudraw.c
index 61853ece5..45465504a 100644
--- a/src/k_menudraw.c
+++ b/src/k_menudraw.c
@@ -3029,7 +3029,7 @@ fixed_t M_DrawCupWinData(INT32 rankx, INT32 ranky, cupheader_t *cup, UINT8 diffi
 	patch_t *charPat = NULL;
 
 	if ((windata->best_skin.unloaded != NULL)
-		|| (windata->best_skin.id > numskins))
+		|| (windata->best_skin.id >= numskins))
 	{
 		colormap = NULL;