fix: added null checks to PluginAttributeService