Don't blow up if there's a null value
Merge pull request #2377 from dimagi/consumption-view-fix

Don't blow up if there's a null value
Merge branch 'commtrack-makethehurtingstop' into autostaging