diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 2badebb89..e6954d8e6 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,10 @@
+December 13, 2006 (Changes by Graf Zahl)
+- Fixed: The particle fountains' names were different than before
+- Fixed: FTexture::CheckForTexture should return NULL if the texture it
+  finds is of type FTexture::TEX_Null. If this isn't done not all occurences
+  of AASHITTY being used to silence an editor's error checker will be handled
+  correctly. In particular the transparent door trick will break.
+
 December 10, 2006 (Changes by Graf Zahl)
 - Fixed: When a DehackedPickup replacement object is created it must copy
   the state labels of the parent object.
diff --git a/src/r_data.cpp b/src/r_data.cpp
index d6134f8cc..5e56ca0ac 100644
--- a/src/r_data.cpp
+++ b/src/r_data.cpp
@@ -116,7 +116,8 @@ int FTextureManager::CheckForTexture (const char *name, int usetype, BITFIELD fl
 			// The name matches, so check the texture type
 			if (usetype == FTexture::TEX_Any)
 			{
-				return i;
+				// All NULL textures should actually return 0
+				return tex->UseType==FTexture::TEX_Null? 0 : i;
 			}
 			else if ((flags & TEXMAN_Overridable) && tex->UseType == FTexture::TEX_Override)
 			{
diff --git a/wadsrc/decorate/shared/fountain.txt b/wadsrc/decorate/shared/fountain.txt
index 4fa505d5d..5f1e5521c 100644
--- a/wadsrc/decorate/shared/fountain.txt
+++ b/wadsrc/decorate/shared/fountain.txt
@@ -1,35 +1,35 @@
 
-ACTOR ParticleFountainRed : ParticleFountain 9027
+ACTOR RedParticleFountain : ParticleFountain 9027
 {
 	Health 1
 }
 
-ACTOR ParticleFountainGreen : ParticleFountain 9028
+ACTOR GreenParticleFountain : ParticleFountain 9028
 {
 	Health 2
 }
 
-ACTOR ParticleFountainBlue : ParticleFountain 9029
+ACTOR BlueParticleFountain : ParticleFountain 9029
 {
 	Health 3
 }
 
-ACTOR ParticleFountainYellow : ParticleFountain 9030
+ACTOR YellowParticleFountain : ParticleFountain 9030
 {
 	Health 4
 }
 
-ACTOR ParticleFountainPurple : ParticleFountain 9031
+ACTOR PurpleParticleFountain : ParticleFountain 9031
 {
 	Health 5
 }
 
-ACTOR ParticleFountainBlack : ParticleFountain 9032
+ACTOR BlackParticleFountain : ParticleFountain 9032
 {
 	Health 6
 }
 
-ACTOR ParticleFountainWhite : ParticleFountain 9033
+ACTOR WhiteParticleFountain : ParticleFountain 9033
 {
 	Health 7
 }