CLN some bad data from yamls was thowing exceptions sometimes

TODO notify upstream