Gracefully handle disabled clients
4.2.3