diff --git a/dlls/client.cpp b/dlls/client.cpp
index 360499c1..f2eceb1c 100644
--- a/dlls/client.cpp
+++ b/dlls/client.cpp
@@ -1234,7 +1234,7 @@ we could also use the pas/ pvs that we set in SetupVisibility, if we wanted to.
 int AddToFullPack( struct entity_state_s *state, int e, edict_t *ent, edict_t *host, int hostflags, int player, unsigned char *pSet )
 {
 	int					i;
-	static int counter; // XASH3DMAX_VISIBLE_PACKET == 512
+	static int counter; // XASH3D MAX_VISIBLE_PACKET == 512
 	bool hide = false;
 
 	if( ( ent == host || player ) && counter > gpGlobals->maxClients  + 1 )
diff --git a/dlls/plats.cpp b/dlls/plats.cpp
index 36c1bde3..f30a1a68 100644
--- a/dlls/plats.cpp
+++ b/dlls/plats.cpp
@@ -736,6 +736,12 @@ void CFuncTrain::Next( void )
 		return;
 	}
 
+	if( pTarg->GetNextTarget() == pTarg )
+	{
+		ALERT(at_error, "train short loop!");
+		return;
+	}
+
 	// Save last target in case we need to find it again
 	pev->message = pev->target;