Fixed issue causing null topic to overwrite correct topic