Merge "Fix null-deref crash while fuzzing"