Handle blank topics better