Merge "Remove unnecessary null check"