#827 Improve null handling
convert all property even those null