Changed from empty string to null