Add safety against emtpy toolbar