Merge "Fix invalid code link, update exception message" into main