diff --git a/libs/util/wad.c b/libs/util/wad.c
index ed0749594..017e48605 100644
--- a/libs/util/wad.c
+++ b/libs/util/wad.c
@@ -127,6 +127,9 @@ W_GetLumpName (const char *name)
 {
 	lumpinfo_t *lump;
 
+	if (!wad_base) {
+		return 0;
+	}
 	lump = W_GetLumpinfo (name);
 
 	return (void *) (wad_base + lump->filepos);
diff --git a/ruamoko/qwaq/builtins/graphics.c b/ruamoko/qwaq/builtins/graphics.c
index ee9fb8025..709f05b4f 100644
--- a/ruamoko/qwaq/builtins/graphics.c
+++ b/ruamoko/qwaq/builtins/graphics.c
@@ -326,7 +326,6 @@ BI_Graphics_Init (progs_t *pr)
 	generate_palette ();
 	generate_colormap ();
 
-	W_LoadWadFile ("gfx.wad");
 	VID_Init (default_palette[0], default_colormap);
 	IN_Init ();
 	Mod_Init ();