Account for nulls in body length report.
Remove bug from TODO.