diff --git a/engine/server/sv_client.c b/engine/server/sv_client.c
index 3f0c4bd0..e1215491 100644
--- a/engine/server/sv_client.c
+++ b/engine/server/sv_client.c
@@ -733,7 +733,8 @@ sv_client_t *SV_ClientByName( const char *name )
 	sv_client_t *cl;
 	int i;
 
-	ASSERT( name && *name );
+	if( !COM_CheckString( name ))
+		return NULL;
 
 	for( i = 0, cl = svs.clients; i < svgame.globals->maxClients; i++, cl++ )
 	{