Fixed code to pass code audit with minimal problems - 5 unlogged exceptions