Fixes issue with KeyErrors recently being returned