Add guards to remove pluginsync warnings