Abort and warn about topic loops in a couple more places