diff --git a/engine/client/cl_pmove.c b/engine/client/cl_pmove.c
index e6b51732..5cc27021 100644
--- a/engine/client/cl_pmove.c
+++ b/engine/client/cl_pmove.c
@@ -320,11 +320,15 @@ static void CL_CopyEntityToPhysEnt( physent_t *pe, entity_state_t *state, qboole
 		// client or bot
 		Q_snprintf( pe->name, sizeof( pe->name ), "player %i", pe->player - 1 );
 	}
-	else
+	else if( mod != NULL )
 	{
 		// otherwise copy the modelname
 		Q_strncpy( pe->name, mod->name, sizeof( pe->name ));
 	}
+	else
+	{
+		Q_strncpy( pe->name, "entity %i", state->number );
+	}
 
 	pe->model = pe->studiomodel = NULL;