Replace null with empty string when making serializer-safe values

Replace null with empty string when making serializer-safe values #3090