Fix problem with non existing key in context