Add Plugin support, fix missing exception