diff --git a/src/extras/custompipes.cpp b/src/extras/custompipes.cpp
index fb529b47..79254eb4 100644
--- a/src/extras/custompipes.cpp
+++ b/src/extras/custompipes.cpp
@@ -525,6 +525,7 @@ SetTxdFindCallback(void)
 	CTxdStore::AddRef(slot);
 	// TODO: function for this
 	genericTxd = CTxdStore::GetSlot(slot)->texDict;
+	assert(genericTxd);
 	if(defaultFindCB == nil)
 		defaultFindCB = rw::Texture::findCB;
 	rw::Texture::findCB = customFindCB;
diff --git a/src/rw/TexRead.cpp b/src/rw/TexRead.cpp
index 122ce655..0ef260b1 100644
--- a/src/rw/TexRead.cpp
+++ b/src/rw/TexRead.cpp
@@ -289,6 +289,11 @@ CreateTxdImageForVideoCard()
 		ConvertingTexturesScreen(i, TXDSTORESIZE, "CVT_MSG");
 
 		if (CTxdStore::GetSlot(i) != nil && CStreaming::IsObjectInCdImage(i + STREAM_OFFSET_TXD)) {
+#ifdef FIX_BUGS
+			if(strcmp(CTxdStore::GetTxdName(i), "generic") == 0)
+				continue;
+#endif
+
 			CStreaming::RequestTxd(i, STREAMFLAGS_KEEP_IN_MEMORY);
 			CStreaming::RequestModelStream(0);
 			CStreaming::FlushChannels();