Moved exception list to plugin