Fun with Error Handling refactoring