Get rid of unnecessary branch.
Handle topic being nil, which happens a few times in the test suite.