r16209: Klocwork bug #66, ensure no null deref.