Merge "Update exception thrown for consistency." into main