Adds additional checks to allow for disabling the Toolbar from within another add-on #48