Merge "Add null checks for strings"