Merge "Improve CursorWindow failure message"