Prevent batches without client from failing to display