Fix for bug 960621 - compensates for possible NULLs in fields
Migration for bug 960621
Merge pull request #1801 from selenamarie/bug960621-tcbs-null-value-errors

Bug960621 tcbs null value errors