diff --git a/src/g_level.cpp b/src/g_level.cpp
index 5bc7d44e0..5f074ddb3 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -776,7 +776,7 @@ void G_DoCompleted (void)
 		AM_Stop ();
 
 	wminfo.finished_ep = level.cluster - 1;
-	wminfo.LName0 = TexMan[TexMan.CheckForTexture(level.info->PName, FTexture::TEX_MiscPatch)];
+	wminfo.LName0 = TexMan.CheckForTexture(level.info->PName, FTexture::TEX_MiscPatch);
 	wminfo.current = level.MapName;
 
 	if (deathmatch &&
@@ -792,12 +792,12 @@ void G_DoCompleted (void)
 		if (nextinfo == NULL || strncmp (nextlevel, "enDSeQ", 6) == 0)
 		{
 			wminfo.next = nextlevel;
-			wminfo.LName1 = NULL;
+			wminfo.LName1.SetInvalid();
 		}
 		else
 		{
 			wminfo.next = nextinfo->MapName;
-			wminfo.LName1 = TexMan[TexMan.CheckForTexture(nextinfo->PName, FTexture::TEX_MiscPatch)];
+			wminfo.LName1 = TexMan.CheckForTexture(nextinfo->PName, FTexture::TEX_MiscPatch);
 		}
 	}
 
diff --git a/src/wi_stuff.cpp b/src/wi_stuff.cpp
index 5bb178665..e695e1ca0 100644
--- a/src/wi_stuff.cpp
+++ b/src/wi_stuff.cpp
@@ -836,7 +836,7 @@ public:
 	{
 		int y = WI_TITLEY * CleanYfac;
 
-		y = WI_DrawName(y, wbs->LName0, lnametexts[0]);
+		y = WI_DrawName(y, TexMan(wbs->LName0), lnametexts[0]);
 	
 		// Adjustment for different font sizes for map name and 'finished'.
 		y -= ((mapname.mFont->GetHeight() - finished.mFont->GetHeight()) * CleanYfac) / 4;
@@ -866,7 +866,7 @@ public:
 
 		y = WI_DrawPatchText(y, &entering, "WI_ENTERING");
 		y += entering.mFont->GetHeight() * CleanYfac / 4;
-		WI_DrawName(y, wbs->LName1, lnametexts[1]);
+		WI_DrawName(y, TexMan(wbs->LName1), lnametexts[1]);
 	}
 
 
diff --git a/src/wi_stuff.h b/src/wi_stuff.h
index 7eefb9ee5..8670b759f 100644
--- a/src/wi_stuff.h
+++ b/src/wi_stuff.h
@@ -51,8 +51,8 @@ struct wbstartstruct_t
 	FString		current;	// [RH] Name of map just finished
 	FString		next;		// next level, [RH] actual map name
 
-	FTexture	*LName0;
-	FTexture	*LName1;
+	FTextureID	LName0;
+	FTextureID	LName1;
 
 	int			maxkills;
 	int			maxitems;