[SD-835] Fixing KeyError