Replaced returning empty strings with null