Merge "Ensure NULL checks are done before dereferencing pointer."