diff --git a/docs/rh-log.txt b/docs/rh-log.txt
index 80ed9926b0..c49cbb0232 100644
--- a/docs/rh-log.txt
+++ b/docs/rh-log.txt
@@ -1,3 +1,10 @@
+August 19, 2007 (Changes by Graf Zahl)
+- Fixed: dumpmap crashed when used outside a map.
+
+August 10, 2007 (Changes by Graf Zahl)
+- Exported A_DeQueueCorpse to DECORATE. It seems I forgot this when exporting
+  A_QueueCorpse.
+
 August 9, 2007 (Changes by Graf Zahl)
 - Moved setting of gameskill from M_ChooseSkill to G_DoNewGame because it
   doesn't work in M_ChooseSkill when the full console is open.
diff --git a/src/codepointers.h b/src/codepointers.h
index 36271b7d51..9a7f415dfc 100644
--- a/src/codepointers.h
+++ b/src/codepointers.h
@@ -97,6 +97,7 @@ ACTOR(Respawn)
 ACTOR(BarrelDestroy)
 ACTOR(PlayerSkinCheck)
 ACTOR(QueueCorpse)
+ACTOR(DeQueueCorpse)
 ACTOR(SetGravity)
 
 // Special code pointers for Strife's player - not to be used elsewhere!
diff --git a/src/g_level.cpp b/src/g_level.cpp
index 67122eba87..e8a26f4970 100644
--- a/src/g_level.cpp
+++ b/src/g_level.cpp
@@ -1369,7 +1369,7 @@ bool CheckWarpTransMap (char mapname[9], bool substitute)
 // consoleplayer, playeringame[] should be set.
 //
 static char d_mapname[256];
-static int d_skill;
+static int d_skill=-1;
 
 void G_DeferedInitNew (const char *mapname, int newskill)
 {
diff --git a/src/m_options.cpp b/src/m_options.cpp
index e9584e5731..26e5f939f7 100644
--- a/src/m_options.cpp
+++ b/src/m_options.cpp
@@ -802,7 +802,7 @@ menu_t MessagesMenu =
 {
 	"MESSAGES",
 	0,
-	12,
+	countof(MessagesItems),
 	0,
 	MessagesItems,
 };
diff --git a/src/p_writemap.cpp b/src/p_writemap.cpp
index 78a4d230ac..1f711a6790 100644
--- a/src/p_writemap.cpp
+++ b/src/p_writemap.cpp
@@ -32,6 +32,12 @@ CCMD (dumpmap)
 		Printf ("Usage: dumpmap <wadname> [mapname]\n");
 		return;
 	}
+	
+	if (gamestate != GS_LEVEL)
+	{
+		Printf ("You can only dump a map when inside a level.\n");
+		return;
+	}
 
 	if (argv.argc() < 3)
 	{
diff --git a/wadsrc/decorate/nativeclasses.txt b/wadsrc/decorate/nativeclasses.txt
index 30b3c50b40..9d2785bd71 100644
--- a/wadsrc/decorate/nativeclasses.txt
+++ b/wadsrc/decorate/nativeclasses.txt
@@ -170,6 +170,7 @@ class Actor extends Thinker
 	action native A_Respawn(optional evalnot bool fog);
 	action native A_BarrelDestroy();
 	action native A_QueueCorpse();
+	action native A_DeQueueCorpse();
 	
 	action native A_SelectWeapon(class<Weapon> whichweapon);
 }