Added check for removed keys.