Improve error handling during audit trailing