Check for null when merging properties