Cleaned up chore exception handling