Merge "Avoid masking an assert failure with a KeyError Exception"