Fix a fatal error that broke (re)moving topics.

Signed-off-by: Yoshi2889 <rick.2889@gmail.com>
Merge pull request #1970 from Yoshi2889/release-2.1

Fix a fatal error that broke (re)moving topics.