Gentler handling of ErrorKeyNotFound

[#79618168]

Signed-off-by: Matthew Sykes <matthew.sykes@gmail.com>