Fix handling of clients that are faulted