Explicitly handle None in client pipe