fixed null value parsing