Merge "Remove unnecessary pointer check"