Please review: ticket 47877 - check_and_add_entry does not ignore existing entry