Added null safe string conversion