tap: Move client registration check to top