Rolling up changes to assist in handling a user with duplicate or outdated keys
Update error messages for clarity