Added checks in Topic()