Merge "Avoid PluginManager NPE"