Restore support for badges being null
Merge pull request #179 from wmde/badgesnull

Restore support for badges being null