Error handling resolved