fixes ZEN-15717

DO NOT MERGE
What exits the for loop other than the fatal, which seems drastic?