Add extra check on topic_type