Fix issue #1258

Correctly handle DEFAULT_DATE = None .