Bug fix: ensure Busbar passes on None before stopping