s4-client: Make sure we have a valid count if we goto cleanup.