Test for the presence of entries more vigorously to avoid a TypeError crash if something is undefined
Update npm packages to latest