Added better checks that entry is never expired if it is joined