Fix plugin name
Fix error raising/handling inside plugin