- Fix issue with audit exceptions