diff --git a/src/client/refresh/gl/header/local.h b/src/client/refresh/gl/header/local.h
index 75bf0868..1e6bc501 100644
--- a/src/client/refresh/gl/header/local.h
+++ b/src/client/refresh/gl/header/local.h
@@ -194,6 +194,8 @@ extern cvar_t *gl_customheight;
 
 extern cvar_t *gl_retexturing;
 
+extern cvar_t *gl_nolerp_list;
+
 extern cvar_t *gl_lightmap;
 extern cvar_t *gl_shadows;
 extern cvar_t *gl_stencilshadow;
diff --git a/src/client/refresh/gl/r_draw.c b/src/client/refresh/gl/r_draw.c
index 61a49b2d..37dc9e5b 100644
--- a/src/client/refresh/gl/r_draw.c
+++ b/src/client/refresh/gl/r_draw.c
@@ -33,14 +33,9 @@ void Scrap_Upload(void);
 
 extern unsigned r_rawpalette[256];
 
-static cvar_t *gl_nolerp_list;
-
 void
 Draw_InitLocal(void)
 {
-	/* don't bilerp characters and crosshairs */
-	gl_nolerp_list = ri.Cvar_Get("gl_nolerp_list", "pics/conchars.pcx pics/ch1.pcx pics/ch2.pcx pics/ch3.pcx", 0);
-
 	/* load console characters */
 	draw_chars = R_FindImage("pics/conchars.pcx", it_pic);
 }
diff --git a/src/client/refresh/gl/r_image.c b/src/client/refresh/gl/r_image.c
index af7ad7e8..ecbcaea5 100644
--- a/src/client/refresh/gl/r_image.c
+++ b/src/client/refresh/gl/r_image.c
@@ -880,10 +880,9 @@ R_LoadPic(char *name, byte *pic, int width, int realwidth,
 
 	qboolean nolerp = false;
 
-	cvar_t* nolerp_var = ri.Cvar_Get("gl_nolerp_list", NULL, 0); // FIXME: isn't this cached somewhere?!
-	if(nolerp_var != NULL && nolerp_var->string != NULL)
+	if(gl_nolerp_list != NULL && gl_nolerp_list->string != NULL)
 	{
-		nolerp = strstr(nolerp_var->string, name) != NULL;
+		nolerp = strstr(gl_nolerp_list->string, name) != NULL;
 	}
 
 	/* find a free image_t */
@@ -1219,9 +1218,10 @@ R_FindImage(char *name, imagetype_t type)
 		 * if (realwidth == 0 || realheight == 0) return NULL;
 		 */
 
-		LoadSTB(name, ext, &pic, &width, &height);
-		image = R_LoadPic(name, pic, width, realwidth,
-				height, realheight, type, 32);
+		if(LoadSTB(name, ext, &pic, &width, &height))
+		{
+			image = R_LoadPic(name, pic, width, realwidth, height, realheight, type, 32);
+		}
 	}
 	else
 	{
diff --git a/src/client/refresh/gl/r_main.c b/src/client/refresh/gl/r_main.c
index 26cbe5bf..ffb71ad0 100644
--- a/src/client/refresh/gl/r_main.c
+++ b/src/client/refresh/gl/r_main.c
@@ -103,6 +103,8 @@ cvar_t *gl_customheight;
 
 cvar_t *gl_retexturing;
 
+cvar_t *gl_nolerp_list;
+
 cvar_t *gl_dynamic;
 cvar_t *gl_modulate;
 cvar_t *gl_nobind;
@@ -1254,6 +1256,8 @@ R_Register(void)
 
 	gl_retexturing = ri.Cvar_Get("gl_retexturing", "1", CVAR_ARCHIVE);
 
+	/* don't bilerp characters and crosshairs */
+	gl_nolerp_list = ri.Cvar_Get("gl_nolerp_list", "pics/conchars.pcx pics/ch1.pcx pics/ch2.pcx pics/ch3.pcx", 0);
 
 	gl_stereo = ri.Cvar_Get( "gl_stereo", "0", CVAR_ARCHIVE );
 	gl_stereo_separation = ri.Cvar_Get( "gl_stereo_separation", "-0.4", CVAR_ARCHIVE );
diff --git a/src/client/refresh/gl3/gl3_draw.c b/src/client/refresh/gl3/gl3_draw.c
index 2ee460c8..2d1aac5c 100644
--- a/src/client/refresh/gl3/gl3_draw.c
+++ b/src/client/refresh/gl3/gl3_draw.c
@@ -29,16 +29,11 @@
 
 unsigned d_8to24table[256];
 
-static cvar_t *gl_nolerp_list;
-
 gl3image_t *draw_chars;
 
 void
 GL3_Draw_InitLocal(void)
 {
-	/* don't bilerp characters and crosshairs */
-	gl_nolerp_list = ri.Cvar_Get("gl_nolerp_list", "pics/conchars.pcx pics/ch1.pcx pics/ch2.pcx pics/ch3.pcx", 0);
-
 	/* load console characters */
 	draw_chars = GL3_FindImage("pics/conchars.pcx", it_pic);
 }
diff --git a/src/client/refresh/gl3/gl3_image.c b/src/client/refresh/gl3/gl3_image.c
index af558e67..a72c9501 100644
--- a/src/client/refresh/gl3/gl3_image.c
+++ b/src/client/refresh/gl3/gl3_image.c
@@ -319,9 +319,10 @@ GL3_FindImage(char *name, imagetype_t type)
 		 * if (realwidth == 0 || realheight == 0) return NULL;
 		 */
 
-		LoadSTB(name, ext, &pic, &width, &height);
-		image = R_LoadPic(name, pic, width, realwidth,
-				height, realheight, type, 32);
+		if(LoadSTB(name, ext, &pic, &width, &height))
+		{
+			image = R_LoadPic(name, pic, width, realwidth, height, realheight, type, 32);
+		}
 	}
 	else
 	{
diff --git a/src/client/refresh/gl3/gl3_main.c b/src/client/refresh/gl3/gl3_main.c
index 162a6325..80be6802 100644
--- a/src/client/refresh/gl3/gl3_main.c
+++ b/src/client/refresh/gl3/gl3_main.c
@@ -51,6 +51,8 @@ cvar_t *gl_customheight;
 cvar_t *vid_gamma;
 cvar_t *gl_anisotropic;
 
+cvar_t *gl_nolerp_list;
+
 cvar_t *gl3_debugcontext;
 
 static void
@@ -78,10 +80,14 @@ GL3_Register(void)
 	gl_swapinterval = ri.Cvar_Get("gl_swapinterval", "1", CVAR_ARCHIVE);
 	gl_msaa_samples = ri.Cvar_Get ( "gl_msaa_samples", "0", CVAR_ARCHIVE );
 	gl_retexturing = ri.Cvar_Get("gl_retexturing", "1", CVAR_ARCHIVE);
-	gl3_debugcontext = ri.Cvar_Get("gl3_debugcontext", "0", 0); // TODO: really archive?
+	gl3_debugcontext = ri.Cvar_Get("gl3_debugcontext", "0", 0);
 	gl_mode = ri.Cvar_Get("gl_mode", "4", CVAR_ARCHIVE);
 	gl_customwidth = ri.Cvar_Get("gl_customwidth", "1024", CVAR_ARCHIVE);
 	gl_customheight = ri.Cvar_Get("gl_customheight", "768", CVAR_ARCHIVE);
+
+	/* don't bilerp characters and crosshairs */
+	gl_nolerp_list = ri.Cvar_Get("gl_nolerp_list", "pics/conchars.pcx pics/ch1.pcx pics/ch2.pcx pics/ch3.pcx", 0);
+
 	gl_anisotropic = ri.Cvar_Get("gl_anisotropic", "0", CVAR_ARCHIVE);
 
 	vid_fullscreen = ri.Cvar_Get("vid_fullscreen", "0", CVAR_ARCHIVE);
diff --git a/src/client/refresh/gl3/header/local.h b/src/client/refresh/gl3/header/local.h
index c1330bc6..e74081e8 100644
--- a/src/client/refresh/gl3/header/local.h
+++ b/src/client/refresh/gl3/header/local.h
@@ -144,6 +144,9 @@ extern cvar_t *vid_fullscreen;
 extern cvar_t *gl_mode;
 extern cvar_t *gl_customwidth;
 extern cvar_t *gl_customheight;
+
+extern cvar_t *gl_nolerp_list;
+
 extern cvar_t *vid_gamma;
 extern cvar_t *gl_anisotropic;