Catch date handling on TypeError and ValueError. We seem to get both.
Merge commit '70e52efbfaf4d44725f0bc73baa927440b885300'