Make TDS CDR more resilient (bug #3597)