Improving handling of null-values in DateTime