specific key does not exist. This then allows r16613 to be reverted as there is no need to distinguish the cases. Fixes #2087.