Merge "Null pointer check missing in chromium"