I ran into the case where `entry[subkey]` was undefined (malformed registry data). So now we return `entry` in that case.