When value is null, don't try to convert to Date, instead just leave it
Add test for checking the new behaviour
#572