diff --git a/src/hardware/hw_cache.c b/src/hardware/hw_cache.c
index 85bbfd648..d244ec0f6 100644
--- a/src/hardware/hw_cache.c
+++ b/src/hardware/hw_cache.c
@@ -758,10 +758,15 @@ static void GetMapTexture(INT32 tex, GLMapTexture_t *grtex, GLMipmap_t *mipmap)
 
 GLMapTexture_t *HWR_GetTexture(INT32 tex)
 {
+	if (tex < 0 || tex >= (signed)gl_numtextures)
+	{
 #ifdef PARANOIA
-	if ((unsigned)tex >= gl_numtextures)
-		I_Error("HWR_GetTexture: tex >= numtextures\n");
+		I_Error("HWR_GetTexture: Invalid texture ID %d", tex);
+#else
+		HWR_SetCurrentTexture(NULL);
+		return;
 #endif
+	}
 
 	GLMapTexture_t *grtex = &gl_textures[tex];