Add more logging to help TC troubleshooting