r17864: Fix possible null deref if client doesn't give us