Fixed round tripping of datetime, null strings