Refactoring to support better error handling