Check for a nil topic before loading more.

Avoids a rare crash at launch in certain situations.
Minor code style fix and removes a commented method.
Fixes #1903 
Makes sense, but I wanted to avoid shuffling anything around with this PR.