r17866: Fix possible null deref - found by Stanford checker.