Fixed ERRAI-764: Bus thread not stopping on shutdown