This block of changes (lines 284-293) should have no functional changes. The previously combined error message is now separated into two more specific messages.