diff --git a/src/g_cmds.c b/src/g_cmds.c
index 72a0ec6..72e5fbf 100644
--- a/src/g_cmds.c
+++ b/src/g_cmds.c
@@ -1368,6 +1368,12 @@ Cmd_ListEntities_f(edict_t *ent)
 		edict_t *cur = &g_edicts[i];
 		qboolean print = false;
 
+		/* Ensure that the entity is valid. */
+		if (!cur->classname)
+		{
+			continue;
+		}
+
 		if (all)
 		{
 			print = true;