Cleaner fix for setDate(null)