Restore support for badges being null