diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index ff3b59bf8..25f7c51d8 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,7 @@
+October 29, 2008  (Changes by Graf Zahl)
+- Fixed: FxClassTypeCast::Resolve didn't work for NULL classes because a variable
+  was not initialized.
+
 October 28, 2008  (Changes by Graf Zahl)
 - Fixed: The railgun attack functions still read their puff parameters as names
   even though they are now passed as class pointers.
diff --git a/src/thingdef/thingdef_expression.cpp b/src/thingdef/thingdef_expression.cpp
index b3258353f..1f345f264 100644
--- a/src/thingdef/thingdef_expression.cpp
+++ b/src/thingdef/thingdef_expression.cpp
@@ -2474,8 +2474,8 @@ FxExpression *FxClassTypeCast::Resolve(FCompileContext &ctx)
 	if (basex->isConstant())
 	{
 		FName clsname = basex->EvalExpression(NULL).GetName();
-		const PClass *cls;
-		
+		const PClass *cls = NULL;
+
 		if (clsname != NAME_None || !ctx.isconst)
 		{
 			cls= PClass::FindClass(clsname);