#20467: Better handle invalid date CFs

It fix bug [#20467](http://issues.bestpractical.com/Ticket/Display.html?id=20467)