Add error handling utility
Fix merge conflict