Add error handling capabilities