Reviewed and attempted to unify exception handling and logging policies