also check for self.account is None
Merge pull request #3679 from dimagi/billing-fix

check for self.account is None