When value is null, don't try to convert to Date, instead just leave it