CLC-1648 Handle invalid date gracefully