Minor date fix to handle null case