Fix date null error #1