Further work on key-not-found exceptions