Merge "Add error reporting mechanism for failing Unwind."