diff --git a/common/bspfile.cpp b/common/bspfile.cpp
index 7867a08..2599de7 100644
--- a/common/bspfile.cpp
+++ b/common/bspfile.cpp
@@ -1996,6 +1996,13 @@ char*           GetTextureByNumber(int texturenumber)
     ofs = ((dmiptexlump_t*)g_dtexdata)->dataofs[info->miptex];
     miptex = (miptex_t*)(&g_dtexdata[ofs]);
 
+	// cypress -- hacked-in support for __TB_empty
+	// just sorta replacing __TB_empty with null here, because
+	// ericw-tools does the same thing, and this is the best
+	// place to do it with the least amount of work required.
+	if (!strncasecmp(miptex->name, "__TB_empty", 10))
+		return "null";
+
     return miptex->name;
 }
 
diff --git a/common/cmdlib.h b/common/cmdlib.h
index b61f312..9336e52 100644
--- a/common/cmdlib.h
+++ b/common/cmdlib.h
@@ -93,6 +93,7 @@
 #define ZHLT_EMBEDLIGHTMAP // this feature requires HLRAD_TEXTURE and RIPENT_TEXTURE //--vluzacn
 	#endif
 //#define ZHLT_HIDDENSOUNDTEXTURE //--vluzacn
+#define ZHLT_TRENCHBROOMNULL_FIX //--cypress
 
 #define COMMON_HULLU // winding optimisations by hullu