Merge "Remove null-ptr deref compiler warning."