Null handling for dates. attempt to fix #715