diff --git a/src/c_console.cpp b/src/c_console.cpp
index 086861229..2d164c478 100644
--- a/src/c_console.cpp
+++ b/src/c_console.cpp
@@ -1747,6 +1747,14 @@ void C_AddTabCommand (const char *name)
 
 void C_RemoveTabCommand (const char *name)
 {
+	if (TabCommands.Size() == 0)
+	{
+		// There are no tab commands that can be removed.
+		// This is important to skip construction of aname 
+		// in case the NameManager has already been destroyed.
+		return;
+	}
+
 	FName aname(name, true);
 
 	if (aname == NAME_None)
diff --git a/src/name.cpp b/src/name.cpp
index 8140829c6..ecedcf0f3 100644
--- a/src/name.cpp
+++ b/src/name.cpp
@@ -35,6 +35,7 @@
 #include <string.h>
 #include "name.h"
 #include "c_dispatch.h"
+#include "c_console.h"
 
 // MACROS ------------------------------------------------------------------
 
@@ -268,6 +269,8 @@ FName::NameManager::~NameManager()
 {
 	NameBlock *block, *next;
 
+	C_ClearTabCommands();
+
 	for (block = Blocks; block != NULL; block = next)
 	{
 		next = block->NextBlock;