Add awaitable error handling