Set topic before we try to use it if it is empty. Change-Id: I47e1ada1667466f0987af2ff15b07e1bf8e3fec6