slight re-org of unknown client handling