Merge "Add quotes in empty check."