Bug960621 tcbs null value errors

Fixes some problems in prod.